Merge branch 'beta'

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 6d93c15c..3403f72c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,7 @@ Version 6.1.12  [BETA] (al), 2011-??-??
 - bugfix: memcpy overflow can occur in allowed sender checkig
   if a name is resolved to IPv4-mapped-on-IPv6 address
   Found by Ismail Dönmez at suse
+- bugfix: The NUL-Byte for the syslogtag was not copied in MsgDup (msg.c)
 ---------------------------------------------------------------------------
 Version 6.1.11  [BETA] (rgerhards), 2011-07-11
 - systemd support: set stdout/stderr to null - thx to Lennart for the patch
@@ -345,7 +346,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 40fbf839..3bc6ffe6 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -975,7 +975,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);