bugfix: imfile did not properly initialize strm object ptr

This did not cause any real issue, as with the current config system
the zerod-out static memory actually was initialized. However, this
posed problems after we moved to dynamic memory alloc.

5 files changed, 29 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index d0dd19f3..1c2acf6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------
-Version 7.5.5 [devel] 2013-10-??
+Version 7.5.5 [devel] 2013-10-15
 - imfile: permit to monitor an unlimited number of files
 - imptcp: add "defaultTZ" input parameter
 - imudp: support for multiple receiver threads added
@@ -8,6 +8,30 @@ Version 7.5.5 [devel] 2013-10-??
 - bugfix: mmutf8fix did not properly handle invalid UTF-8 at END of message
   if the very last character sequence was too long, this was not detected
   Thanks to Risto Vaarandi for reporting this problem.
+- mmanon: removed the check for specific "terminator characters" after 
+  last octet. As it turned out, this didn't work in practice as there
+  was an enormous set of potential terminator chars -- so removing
+  them was the best thing to do. Note that this may change behaviour of
+  existing installations. Yet, we still consider this an important
+  bugfix, that should be applied to the stable branch.
+  closes: http://bugzilla.adiscon.com/show_bug.cgi?id=477
+  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 did not detect all IP addresses in rewrite mode
+  The problem occured if two IPs were close to each other and the first one
+  was shrunk.
+  closes: http://bugzilla.adiscon.com/show_bug.cgi?id=485
+  Thanks to micah-at-riseup.net for reporting this bug
+- 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
+- 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
 ---------------------------------------------------------------------------
 Version 7.5.4 [devel] 2013-10-07
 - mmpstrucdata: new module to parse RFC5424 structured data into json
diff --git a/configure.ac b/configure.ac
index 6e10a3b3..4d6a8b25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([rsyslog],[7.5.4],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[7.5.5],[rsyslog@lists.adiscon.com])
 AM_INIT_AUTOMAKE
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/doc/manual.html b/doc/manual.html
index 66475df2..3bc803ca 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ professional services</a> available directly from the source!</p>
 <p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a>
 to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the
 project goals.</p>
-<p><b>This documentation is for version 7.5.4 (devel branch) of rsyslog.</b>
+<p><b>This documentation is for version 7.5.5 (devel branch) of rsyslog.</b>
 Visit the <i><a href="http://www.rsyslog.com/status">rsyslog status page</a></i></b>
 to obtain current version information and project status.
 </p><p><b>If you like rsyslog, you might
diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c
index 8e041c30..9fde0580 100644
--- a/plugins/imfile/imfile.c
+++ b/plugins/imfile/imfile.c
@@ -519,6 +519,7 @@ addListner(instanceConf_t *inst)
 	pThis->escapeLF = inst->escapeLF;
 	pThis->pRuleset = inst->pBindRuleset;
 	pThis->nRecords = 0;
+	pThis->pStrm = NULL;
 	++iFilPtr;	/* we got a new file to monitor */
 
 	resetConfigVariables(NULL, NULL); /* values are both dummies */
diff --git a/tests/diag.sh b/tests/diag.sh
index 7883d93b..8c9aa16e 100755
--- a/tests/diag.sh
+++ b/tests/diag.sh
@@ -9,7 +9,7 @@
 #valgrind="valgrind --tool=drd --log-fd=1"
 #valgrind="valgrind --tool=helgrind --log-fd=1"
 #valgrind="valgrind --tool=exp-ptrcheck --log-fd=1"
-#set -o xtrace
+set -o xtrace
 #export RSYSLOG_DEBUG="debug nologfuncflow noprintmutexaction nostdout"
 #export RSYSLOG_DEBUGLOG="log"
 case $1 in