summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Lorbach <alorbach@adiscon.com>2011-08-11 10:40:30 +0200
committerAndre Lorbach <alorbach@adiscon.com>2011-08-11 10:40:30 +0200
commit1b9a4f303bd3e0cb899788e1a8908ea60e23eadd (patch)
tree2a54342bd256c54a822a55681819c259f5feea36
parente90a380aacb0b7304bec004ea0208b121331dcd3 (diff)
parent00d594348af514fbbbb5f581124ac524d507187f (diff)
downloadrsyslog-1b9a4f303bd3e0cb899788e1a8908ea60e23eadd.tar.gz
rsyslog-1b9a4f303bd3e0cb899788e1a8908ea60e23eadd.tar.xz
rsyslog-1b9a4f303bd3e0cb899788e1a8908ea60e23eadd.zip
Merge branch 'v5-stable' into v5-devel
Conflicts: ChangeLog configure.ac doc/manual.html
-rw-r--r--ChangeLog6
-rw-r--r--runtime/msg.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ed3cfbad..55f6fbc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ Version 5.9.3 [V5-DEVEL] (al), 2011-??-??
- bugfix: potential misadressing in property replacer
- bugfix: MSGID corruption in RFC5424 parser under some circumstances
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=275
+- bugfix: The NUL-Byte for the syslogtag was not copied in MsgDup (msg.c)
---------------------------------------------------------------------------
Version 5.9.2 [V5-DEVEL] (rgerhards), 2011-07-11
- systemd support: set stdout/stderr to null - thx to Lennart for the patch
@@ -79,7 +80,10 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-06-08
affected directive was: $ActionExecOnlyWhenPreviousIsSuspended on
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=236
---------------------------------------------------------------------------
-Version 5.8.4 [V5-stable] (al), 2011-??-??
+Version 5.8.5 [V5-stable] (al), 2011-??-??
+- bugfix: The NUL-Byte for the syslogtag was not copied in MsgDup (msg.c)
+---------------------------------------------------------------------------
+Version 5.8.4 [V5-stable] (al), 2011-08-10
- bugfix: potential misadressing in property replacer
- bugfix: memcpy overflow can occur in allowed sender checkig
if a name is resolved to IPv4-mapped-on-IPv6 address
diff --git a/runtime/msg.c b/runtime/msg.c
index cc7b463d..9fdaded3 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -967,7 +967,7 @@ msg_t* MsgDup(msg_t* pOld)
*/
if(pOld->iLenTAG > 0) {
if(pOld->iLenTAG < CONF_TAG_BUFSIZE) {
- memcpy(pNew->TAG.szBuf, pOld->TAG.szBuf, pOld->iLenTAG);
+ memcpy(pNew->TAG.szBuf, pOld->TAG.szBuf, pOld->iLenTAG + 1);
} else {
if((pNew->TAG.pszTAG = srUtilStrDup(pOld->TAG.pszTAG, pOld->iLenTAG)) == NULL) {
msgDestruct(&pNew);