diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-11 18:20:08 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-11 18:20:08 +0200 |
| commit | 3ebbb9c4bbfe5d4a815861afde28df47d35b022e (patch) | |
| tree | ca9132c1cc42215fe94457a23e7279f2db71f998 /runtime | |
| parent | 7f109cca88816752a9c9cbe255df9e3a5b5a8b5a (diff) | |
| download | rsyslog-3ebbb9c4bbfe5d4a815861afde28df47d35b022e.tar.gz rsyslog-3ebbb9c4bbfe5d4a815861afde28df47d35b022e.tar.xz rsyslog-3ebbb9c4bbfe5d4a815861afde28df47d35b022e.zip | |
bugfix: "last message repeated n times" message was missing hostname
Thanks to Zdenek Salvet for finding this bug and to Bodik for reporting
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/msg.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 820a28a8..f9acb842 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -982,11 +982,15 @@ msg_t* MsgDup(msg_t* pOld) } else { tmpCOPYSZ(RawMsg); } - if(pOld->iLenHOSTNAME < CONF_HOSTNAME_BUFSIZE) { - memcpy(pNew->szHOSTNAME, pOld->szHOSTNAME, pOld->iLenHOSTNAME + 1); - pNew->pszHOSTNAME = pNew->szHOSTNAME; + if(pOld->pszHOSTNAME == NULL) { + pNew->pszHOSTNAME = NULL; } else { - tmpCOPYSZ(HOSTNAME); + if(pOld->iLenHOSTNAME < CONF_HOSTNAME_BUFSIZE) { + memcpy(pNew->szHOSTNAME, pOld->szHOSTNAME, pOld->iLenHOSTNAME + 1); + pNew->pszHOSTNAME = pNew->szHOSTNAME; + } else { + tmpCOPYSZ(HOSTNAME); + } } tmpCOPYCSTR(ProgName); |