Merge branch 'beta'

1 files changed, 11 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index fc54659c..daba1e66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -111,6 +111,12 @@ increase.
   output module interface
 ---------------------------------------------------------------------------
 Version 4.5.3  [v4-beta] (rgerhards), 2009-08-??
+- bugfix: message sanitation had some issues:
+  - control character DEL was not properly escaped
+  - NUL and LF characters were not properly stripped if no control
+    character replacement was to be done
+  - NUL characters in the message body were silently dropped (this was
+    a regeression introduced by some of the recent optimizations)
 - bugfix: strings improperly reused, resulting in some message properties
   be populated with strings from previous messages. This was caused by
   an improper predicate check. [backported from v5]
@@ -216,6 +222,11 @@ Version 4.4.1  [v4-stable] (rgerhards), 2009-08-??
   This resulted in build errors if no Java was present on the build system,
   even though none of the selected option actually required Java.
   (I forgot to backport a similar fix to newer releases).
+- bugfix (backport): omfwd segfault
+  Note that the orginal (higher version) patch states this happens only
+  when debugging mode is turned on. That statement is wrong: if debug
+  mode is turned off, the message is not being emitted, but the division
+  by zero in the actual parameters still happens.
 ---------------------------------------------------------------------------
 Version 4.4.0  [v4-stable] (rgerhards), 2009-08-21
 - bugfix: stderr/stdout were not closed to be able to emit error messages,