diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-01 16:01:32 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-01 16:01:32 +0100 |
| commit | 75a585a7e26d4d6cf59157cf62584c139af1527c (patch) | |
| tree | b7c29c3cb0234f70dcd64259c5b58c64a2311c75 | |
| parent | c130eb20215d5f4ed4fc23c4bf0223b77176617b (diff) | |
| parent | bd73f263b310c29d5e0b0dd541403bde44030b86 (diff) | |
| download | rsyslog-75a585a7e26d4d6cf59157cf62584c139af1527c.tar.gz rsyslog-75a585a7e26d4d6cf59157cf62584c139af1527c.tar.xz rsyslog-75a585a7e26d4d6cf59157cf62584c139af1527c.zip | |
Merge branch 'v5-beta'
Conflicts:
ChangeLog
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | runtime/msg.c | 3 |
2 files changed, 18 insertions, 1 deletions
@@ -8,6 +8,13 @@ Version 6.1.5 [DEVEL] (rgerhards), 2011-02-?? fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=218 - bugfix: memory leak when $RepeatedMsgReduction on was used bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=225 +- bugfix: potential abort condition when $RepeatedMsgReduction set to on + as well as potentially in a number of other places where MsgDup() was + used. This only happened when the imudp input module was used and it + depended on name resolution not yet had taken place. In other words, + this was a strange problem that could lead to hard to diagnose + instability. So if you experience instability, chances are good that + this fix will help. --------------------------------------------------------------------------- Version 6.1.4 [DEVEL] (rgerhards), 2011-02-18 - bugfix/omhdfs: directive $OMHDFSFileName rendered unusable @@ -110,6 +117,15 @@ expected that interfaces, even new ones, break during the initial syslog plain tcp input plugin (NOT supporting TLS!) [ported from v4] --------------------------------------------------------------------------- +Version 5.7.7 [V5-BETA] (rgerhards), 2011-03-?? +- bugfix: potential abort condition when $RepeatedMsgReduction set to on + as well as potentially in a number of other places where MsgDup() was + used. This only happened when the imudp input module was used and it + depended on name resolution not yet had taken place. In other words, + this was a strange problem that could lead to hard to diagnose + instability. So if you experience instability, chances are good that + this fix will help. +--------------------------------------------------------------------------- Version 5.7.6 [V5-BETA] (rgerhards), 2011-02-25 - bugfix: fixed a memory leak and potential abort condition this could happen if multiple rulesets were used and some output batches diff --git a/runtime/msg.c b/runtime/msg.c index 70b20749..ec132489 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -944,13 +944,14 @@ msg_t* MsgDup(msg_t* pOld) pNew->iLenMSG = pOld->iLenMSG; pNew->iLenTAG = pOld->iLenTAG; pNew->iLenHOSTNAME = pOld->iLenHOSTNAME; - if((pOld->msgFlags & NEEDS_DNSRESOL) == 1) { + if((pOld->msgFlags & NEEDS_DNSRESOL)) { localRet = msgSetFromSockinfo(pNew, pOld->rcvFrom.pfrominet); if(localRet != RS_RET_OK) { /* if something fails, we accept loss of this property, it is * better than losing the whole message. */ pNew->msgFlags &= ~NEEDS_DNSRESOL; + pNew->rcvFrom.pRcvFrom = NULL; /* make sure no dangling values */ } } else { if(pOld->rcvFrom.pRcvFrom != NULL) { |