summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-10-18 10:17:49 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-10-18 10:17:49 +0200
commit82f14c80404fe44e5b02afbaa68a4a2634ff50b9 (patch)
tree049e3f81d0ba2c4a27f25075a577be0d9650347e
parenteb95af01e8feb4b3b10e600697b8b8f07a693840 (diff)
downloadrsyslog-82f14c80404fe44e5b02afbaa68a4a2634ff50b9.tar.gz
rsyslog-82f14c80404fe44e5b02afbaa68a4a2634ff50b9.tar.bz2
rsyslog-82f14c80404fe44e5b02afbaa68a4a2634ff50b9.zip
fix cosmetic memleak when property filter is disabled
-rw-r--r--ChangeLog2
-rw-r--r--grammar/rainerscript.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f99756b7..2c3b9e30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ Version 7.5.6 [devel] 2013-10-??
This could happen if the property name was longer than 127 chars, a case
that would not happen in practice.
- bugfix: invalid property filter was not properly disabled in ruleset
+ Note: the cosmetic memory leak introduced with that patch in 7.4.5 is
+ now also fixed.
---------------------------------------------------------------------------
Version 7.5.5 [devel] 2013-10-16
- imfile: permit to monitor an unlimited number of files
diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c
index ff8eba0c..4defc025 100644
--- a/grammar/rainerscript.c
+++ b/grammar/rainerscript.c
@@ -2698,6 +2698,7 @@ cnfstmtNewPROPFILT(char *propfilt, struct cnfstmt *t_then)
cnfstmt->d.s_propfilt.pCSCompValue = NULL;
if(DecodePropFilter((uchar*)propfilt, cnfstmt) != RS_RET_OK) {
cnfstmt->nodetype = S_NOP; /* disable action! */
+ cnfstmtDestructLst(t_then); /* we do no longer need this */
}
}
return cnfstmt;