diff options
| author | Andre Lorbach <alorbach@adiscon.com> | 2011-08-10 11:26:03 +0200 |
|---|---|---|
| committer | Andre Lorbach <alorbach@adiscon.com> | 2011-08-10 11:26:03 +0200 |
| commit | b8d5cd810008f620c789c6969e8dab1bf2219239 (patch) | |
| tree | 8b4d4da14f249f27cc5192f48db8f4b5b8d2dccf | |
| parent | 98e4e10ac1a2d00c895a283e50fd76e9f7f07b3d (diff) | |
| parent | 1d856763f9a3f078af7f066867ae88c59286285c (diff) | |
| download | rsyslog-b8d5cd810008f620c789c6969e8dab1bf2219239.tar.gz rsyslog-b8d5cd810008f620c789c6969e8dab1bf2219239.tar.xz rsyslog-b8d5cd810008f620c789c6969e8dab1bf2219239.zip | |
Merge branch 'v5-stable' into beta
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | runtime/msg.c | 13 |
2 files changed, 13 insertions, 3 deletions
@@ -222,6 +222,9 @@ Version 5.8.4 [V5-stable] (al), 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: potential misadressing in property replacer +- bugfix: MSGID corruption in RFC5424 parser under some circumstances + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=275 --------------------------------------------------------------------------- Version 5.8.3 [V5-stable] (rgerhards), 2011-07-11 - systemd support: set stdout/stderr to null - thx to Lennart for the patch diff --git a/runtime/msg.c b/runtime/msg.c index f1701909..d61aad79 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -1641,14 +1641,21 @@ finalize_it: } -/* rgerhards, 2005-11-24 +/* al, 2011-07-26: LockMsg to avoid race conditions */ static inline char *getMSGID(msg_t *pM) { - return (pM->pCSMSGID == NULL) ? "-" : (char*) rsCStrGetSzStrNoNULL(pM->pCSMSGID); + if (pM->pCSMSGID == NULL) { + return "-"; + } + else { + MsgLock(pM); + char* pszreturn = (char*) rsCStrGetSzStrNoNULL(pM->pCSMSGID); + MsgUnlock(pM); + return pszreturn; + } } - /* rgerhards 2009-06-12: set associated ruleset */ void MsgSetRuleset(msg_t *pMsg, ruleset_t *pRuleset) |