bugfix: fixed abort when invalid template was provided to an action bug:

    http://bugzilla.adiscon.com/show_bug.cgi?id=4

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 429477b5..414696ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@ Version 3.11.3 (rgerhards), 2008-02-??
 - slightly improved man pages for novice users
 - fixed a bug in imklog which lead to duplicate message content in
   kernel logs
+- added support for better plugin handling in libdbi (we contributed
+  a patch to do that, we just now need to wait for the next libdbi
+  version)
 ---------------------------------------------------------------------------
 Version 3.11.2 (rgerhards), 2008-02-15
 - added the capability to monitor text files and process their content
diff --git a/action.c b/action.c
index d9ac6133..938aefaf 100644
--- a/action.c
+++ b/action.c
@@ -126,7 +126,9 @@ rsRetVal actionDestruct(action_t *pThis)
 	DEFiRet;
 	ASSERT(pThis != NULL);
 
-	queueDestruct(&pThis->pQueue);
+	if(pThis->pQueue != NULL) {
+		queueDestruct(&pThis->pQueue);
+	}
 
 	if(pThis->pMod != NULL)
 		pThis->pMod->freeInstance(pThis->pModData);