diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-13 08:15:54 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-13 08:15:54 +0200 |
| commit | d6a6666b66733e63255f806dd272a0b85e0f0c13 (patch) | |
| tree | d4c22d814c9dde486cc1ccf6da9c507817791ccf /runtime/msg.c | |
| parent | 4831a51f5a7c8e3821cb98bc21fb47204e5470c2 (diff) | |
| download | rsyslog-d6a6666b66733e63255f806dd272a0b85e0f0c13.tar.gz rsyslog-d6a6666b66733e63255f806dd272a0b85e0f0c13.tar.xz rsyslog-d6a6666b66733e63255f806dd272a0b85e0f0c13.zip | |
bugfix: race condition when extracting structured data and PROCID
same issue as previous commit for PROGNAME and APPNAME
Diffstat (limited to 'runtime/msg.c')
| -rw-r--r-- | runtime/msg.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index eb1e3ae4..0744edd5 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -1605,9 +1605,19 @@ static inline int getPROCIDLen(msg_t *pM, sbool bLockMutex) */ char *getPROCID(msg_t *pM, sbool bLockMutex) { + uchar *pszRet; + ISOBJ_TYPE_assert(pM, msg); - preparePROCID(pM, bLockMutex); - return (pM->pCSPROCID == NULL) ? "-" : (char*) cstrGetSzStrNoNULL(pM->pCSPROCID); + if(bLockMutex == LOCK_MUTEX) + MsgUnlock(pM); + preparePROCID(pM, MUTEX_ALREADY_LOCKED); + if(pM->pCSPROCID == NULL) + pszRet = UCHAR_CONSTANT(""); + else + pszRet = rsCStrGetSzStrNoNULL(pM->pCSPROCID); + if(bLockMutex == LOCK_MUTEX) + MsgUnlock(pM); + return (char*) pszRet; } @@ -1834,7 +1844,15 @@ static int getStructuredDataLen(msg_t *pM) */ static inline char *getStructuredData(msg_t *pM) { - return (pM->pCSStrucData == NULL) ? "-" : (char*) rsCStrGetSzStrNoNULL(pM->pCSStrucData); + uchar *pszRet; + + MsgUnlock(pM); + if(pM->pCSStrucData == NULL) + pszRet = UCHAR_CONSTANT("-"); + else + pszRet = rsCStrGetSzStrNoNULL(pM->pCSStrucData); + MsgUnlock(pM); + return (char*) pszRet; } |