bugfix: segfault with expression-based filters - so far untested

2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 09fca562..228f9230 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 ---------------------------------------------------------------------------
+Version 3.14.2 (rgerhards), 2008-04-??
+- bugfix: segfault with expression-based filters
+---------------------------------------------------------------------------
 Version 3.14.1 (rgerhards), 2008-04-04
 - bugfix: some messages were emited without hostname
 - bugfix: rsyslogd was no longer build by default; man pages are 
diff --git a/syslogd.c b/syslogd.c
index 355689c0..f21fce7e 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -1053,10 +1053,11 @@ static rsRetVal shouldProcessThisMessage(selector_t *f, msg_t *pMsg, int *bProce
 
 finalize_it:
 	/* destruct in any case, not just on error, but it makes error handling much easier */
-	if(pVM != NULL) {
-		var.Destruct(&pResult);
+	if(pVM != NULL)
 		vm.Destruct(&pVM);
-	}
+
+	if(pResult != NULL)
+		var.Destruct(&pResult);
 
 	*bProcessMsg = bRet;
 	RETiRet;