diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-14 09:05:18 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-14 09:05:18 +0200 |
| commit | d3c3aae83622485b01144681f1cd3462a67bd171 (patch) | |
| tree | 75a31e432c8c34e45954b11c02c045a7d0baee21 | |
| parent | 62a7ff8f59302464d56b44deb89604c672d96b45 (diff) | |
| download | rsyslog-d3c3aae83622485b01144681f1cd3462a67bd171.tar.gz rsyslog-d3c3aae83622485b01144681f1cd3462a67bd171.tar.bz2 rsyslog-d3c3aae83622485b01144681f1cd3462a67bd171.zip | |
bugfix: mmanon sometimes used invalid replacement char in simple mode
depending on configuration sequence, the replacement character was set
to 's' instead of the correct value. Most importantly, it was set to
's' if simple mode was selected and no replacement char set.
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=484
Thanks to micah-at-riseup.net for reporting this bug
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | plugins/mmanon/mmanon.c | 1 |
2 files changed, 6 insertions, 1 deletions
@@ -10,6 +10,12 @@ Version 7.4.5 [v7.4-stable] 2013-09-?? Thanks to Muri Cicanor for initiating the discussion - now requires libestr 0.1.7 as early versions had a nasty bug in string comparisons +- bugfix: mmanon sometimes used invalid replacement char in simple mode + dpending on configuration sequence, the replacement character was set + to 's' instead of the correct value. Most importantly, it was set to + 's' if simple mode was selected and no replacement char set. + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=484 + Thanks to micah-at-riseup.net for reporting this bug - bugfix: memory leak in mmnormalize - bugfix: array-based ==/!= comparisions lead to invalid results This was a regression introduced in 7.3.5 bei the PRI optimizer diff --git a/plugins/mmanon/mmanon.c b/plugins/mmanon/mmanon.c index 7d8f9964..233d9320 100644 --- a/plugins/mmanon/mmanon.c +++ b/plugins/mmanon/mmanon.c @@ -170,7 +170,6 @@ CODESTARTnewActInst cstr); free(cstr); } - pData->replChar = es_getBufAddr(pvals[i].val.d.estr)[0]; } else if(!strcmp(actpblk.descr[i].name, "replacementchar")) { pData->replChar = es_getBufAddr(pvals[i].val.d.estr)[0]; } else if(!strcmp(actpblk.descr[i].name, "ipv4.bits")) { |