diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-11 18:22:19 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-11 18:22:19 +0200 |
| commit | a88d7d29ee2b36827cb3b4df58e77f9ca439bcbc (patch) | |
| tree | 7c1948376b317d01651fe2c86e44ae822523c2a1 /runtime | |
| parent | 8d471ab9450d653dd40187f0476365cce0d3ce4f (diff) | |
| parent | 3ebbb9c4bbfe5d4a815861afde28df47d35b022e (diff) | |
| download | rsyslog-a88d7d29ee2b36827cb3b4df58e77f9ca439bcbc.tar.gz rsyslog-a88d7d29ee2b36827cb3b4df58e77f9ca439bcbc.tar.xz rsyslog-a88d7d29ee2b36827cb3b4df58e77f9ca439bcbc.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
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 5f2efc8c..7c1c13a5 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -997,11 +997,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); |