diff options
| author | Tomas Heinrich <theinric@redhat.com> | 2012-04-05 14:18:11 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-05 14:18:11 +0200 |
| commit | a192300aa26484c88aedd306fdb92d7752eee427 (patch) | |
| tree | 3344f3c8f18ef8aaa5a7f66b79a91cdb57858282 | |
| parent | 2b76241630aa93218c8853a110251dd71478429e (diff) | |
| download | rsyslog-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>
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | runtime/queue.c | 3 |
2 files changed, 5 insertions, 1 deletions
@@ -1,5 +1,8 @@ --------------------------------------------------------------------------- Version 5.8.10 [V5-stable] 2012-??-?? +- bugfix: segfault on startup if $actionqueuefilename was missing for disk + queue config + Thanks to Tomas Heinrich for the patch. - bugfix: segfault if disk-queue was started up with old queue file Thanks to Tomas Heinrich for the patch. - bugfix: memory leak in array passing output module mode 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) { |