summaryrefslogtreecommitdiffstats
path: root/runtime
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 /runtime
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
Diffstat (limited to 'runtime')
-rw-r--r--runtime/msg.c2
1 files changed, 1 insertions, 1 deletions
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);