diff options
| author | Andre Lorbach <alorbach@adiscon.com> | 2011-08-10 11:23:45 +0200 |
|---|---|---|
| committer | Andre Lorbach <alorbach@adiscon.com> | 2011-08-10 11:23:45 +0200 |
| commit | cf7ae32214eefe6e60267dc68cadf17122173f1d (patch) | |
| tree | 4bcc28c4002149981a879df8f46d1fb73effd30f /runtime | |
| parent | f7ad5aeff03833879957ef00136610d1138a7212 (diff) | |
| parent | 1d856763f9a3f078af7f066867ae88c59286285c (diff) | |
| download | rsyslog-cf7ae32214eefe6e60267dc68cadf17122173f1d.tar.gz rsyslog-cf7ae32214eefe6e60267dc68cadf17122173f1d.tar.bz2 rsyslog-cf7ae32214eefe6e60267dc68cadf17122173f1d.zip | |
Merge branch 'v5-stable' into v5-devel
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/msg.c | 13 | ||||
| -rw-r--r-- | runtime/net.c | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 8c8e9670..cc7b463d 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -1629,14 +1629,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) diff --git a/runtime/net.c b/runtime/net.c index 789790f6..4781739f 100644 --- a/runtime/net.c +++ b/runtime/net.c @@ -722,7 +722,7 @@ static rsRetVal AddAllowedSender(struct AllowedSenders **ppRoot, struct AllowedS SIN(allowIP.addr.NetAddr)->sin_port = 0; memcpy(&(SIN(allowIP.addr.NetAddr)->sin_addr.s_addr), &(SIN6(res->ai_addr)->sin6_addr.s6_addr32[3]), - sizeof (struct sockaddr_in)); + sizeof (in_addr_t)); if((iRet = AddAllowedSenderEntry(ppRoot, ppLast, &allowIP, iSignificantBits)) |