diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-09 15:05:32 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-09 15:05:32 +0100 |
| commit | 9b46ba1ad0a1de5268dcf0fc5be6a29417dda0a9 (patch) | |
| tree | 58f3205cabecd8681845cf28326e98f0a317bc4f | |
| parent | 6766b6f3e7cf0331eea40403bae8145ac1fd805c (diff) | |
| parent | 791b16ce06d75944e338a6e5fa14c0394bde6f1d (diff) | |
| download | rsyslog-9b46ba1ad0a1de5268dcf0fc5be6a29417dda0a9.tar.gz rsyslog-9b46ba1ad0a1de5268dcf0fc5be6a29417dda0a9.tar.xz rsyslog-9b46ba1ad0a1de5268dcf0fc5be6a29417dda0a9.zip | |
Merge branch 'v5-stable' into v5-devel
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | runtime/msg.c | 10 |
2 files changed, 7 insertions, 5 deletions
@@ -107,6 +107,8 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-06-08 closes: http://bugzilla.adiscon.com/show_bug.cgi?id=236 --------------------------------------------------------------------------- Version 5.8.7 [V5-stable] 2011-??-?? +- bugfix: instabilities when using RFC5424 header fields + Thanks to Kaiwang Chen for the patch - bugfix: imuxsock did truncate part of received message if it did not contain a proper date. The truncation occured because we removed that part of the messages that was expected to be the date. diff --git a/runtime/msg.c b/runtime/msg.c index 759554d8..810a396e 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -7,7 +7,7 @@ * of the "old" message code without any modifications. However, it * helps to have things at the right place one we go to the meat of it. * - * Copyright 2007, 2008 Rainer Gerhards and Adiscon GmbH. + * Copyright 2007-2012 Rainer Gerhards and Adiscon GmbH. * * This file is part of the rsyslog runtime library. * @@ -1609,7 +1609,7 @@ char *getPROCID(msg_t *pM, sbool bLockMutex) ISOBJ_TYPE_assert(pM, msg); if(bLockMutex == LOCK_MUTEX) - MsgUnlock(pM); + MsgLock(pM); preparePROCID(pM, MUTEX_ALREADY_LOCKED); if(pM->pCSPROCID == NULL) pszRet = UCHAR_CONSTANT(""); @@ -1842,7 +1842,7 @@ static inline char *getStructuredData(msg_t *pM) { uchar *pszRet; - MsgUnlock(pM); + MsgLock(pM); if(pM->pCSStrucData == NULL) pszRet = UCHAR_CONSTANT("-"); else @@ -1890,7 +1890,7 @@ uchar *getProgramName(msg_t *pM, sbool bLockMutex) uchar *pszRet; if(bLockMutex == LOCK_MUTEX) - MsgUnlock(pM); + MsgLock(pM); prepareProgramName(pM, MUTEX_ALREADY_LOCKED); if(pM->pCSProgName == NULL) pszRet = UCHAR_CONSTANT(""); @@ -1948,7 +1948,7 @@ char *getAPPNAME(msg_t *pM, sbool bLockMutex) assert(pM != NULL); if(bLockMutex == LOCK_MUTEX) - MsgUnlock(pM); + MsgLock(pM); prepareAPPNAME(pM, MUTEX_ALREADY_LOCKED); if(pM->pCSAPPNAME == NULL) pszRet = UCHAR_CONSTANT(""); |