diff options
| author | Andre Lorbach <alorbach@adiscon.com> | 2011-08-11 10:58:57 +0200 |
|---|---|---|
| committer | Andre Lorbach <alorbach@adiscon.com> | 2011-08-11 10:58:57 +0200 |
| commit | b37a22e3c185b4f04cc8a41979d983a04eef7300 (patch) | |
| tree | 3f74941bd435ca3e32f5c148ca191dd620e5b1d1 | |
| parent | b882a009284547852efbfee65c2348f729ff7053 (diff) | |
| parent | fcb98138a683c90e484e46eccb5c69e1034e1366 (diff) | |
| download | rsyslog-b37a22e3c185b4f04cc8a41979d983a04eef7300.tar.gz rsyslog-b37a22e3c185b4f04cc8a41979d983a04eef7300.tar.xz rsyslog-b37a22e3c185b4f04cc8a41979d983a04eef7300.zip | |
Merge branch 'v4-stable' into v4-beta
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | runtime/msg.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -83,6 +83,7 @@ Version 4.6.8 [v4-stable] (rgerhards), 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 4.6.7 [v4-stable] (rgerhards), 2011-07-11 - added support for the ":omusrmsg:" syntax in configuring user messages diff --git a/runtime/msg.c b/runtime/msg.c index 6a01827c..6335f462 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -897,7 +897,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); |