summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorTomas Heinrich <theinric@redhat.com>2012-04-05 14:18:11 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-04-05 14:18:11 +0200
commita192300aa26484c88aedd306fdb92d7752eee427 (patch)
tree3344f3c8f18ef8aaa5a7f66b79a91cdb57858282 /runtime
parent2b76241630aa93218c8853a110251dd71478429e (diff)
downloadrsyslog-a192300aa26484c88aedd306fdb92d7752eee427.tar.gz
rsyslog-a192300aa26484c88aedd306fdb92d7752eee427.tar.xz
rsyslog-a192300aa26484c88aedd306fdb92d7752eee427.zip
bugfix: segfault on startup if $actionqueuefilename was missing for disk queue config
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
Diffstat (limited to 'runtime')
-rw-r--r--runtime/queue.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/queue.c b/runtime/queue.c
index 137c9547..9f318523 100644
--- a/runtime/queue.c
+++ b/runtime/queue.c
@@ -2119,7 +2119,8 @@ CODESTARTobjDestruct(qqueue)
* direct queue - because in both cases we have none... ;)
* with a child! -- rgerhards, 2008-01-28
*/
- if(pThis->qType != QUEUETYPE_DIRECT && !pThis->bEnqOnly && pThis->pqParent == NULL)
+ if(pThis->qType != QUEUETYPE_DIRECT && !pThis->bEnqOnly && pThis->pqParent == NULL
+ && pThis->pWtpReg != NULL)
ShutdownWorkers(pThis);
if(pThis->bIsDA && getPhysicalQueueSize(pThis) > 0 && pThis->bSaveOnShutdown) {