diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-24 09:48:38 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-24 09:48:38 +0200 |
| commit | 37ba1df6e37b2d020001f390ccb2462ae04fc9c1 (patch) | |
| tree | 0398e1fa17d3d0001f5cbaeef405844d25ceb7d6 /runtime/parser.c | |
| parent | 6d8df125979065640598bc9126258dc8645f748d (diff) | |
| download | rsyslog-37ba1df6e37b2d020001f390ccb2462ae04fc9c1.tar.gz rsyslog-37ba1df6e37b2d020001f390ccb2462ae04fc9c1.tar.xz rsyslog-37ba1df6e37b2d020001f390ccb2462ae04fc9c1.zip | |
bugfix: random data could be appended to message, possibly causing segfaults
Diffstat (limited to 'runtime/parser.c')
| -rw-r--r-- | runtime/parser.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/runtime/parser.c b/runtime/parser.c index 0b45bfd5..079bcf5e 100644 --- a/runtime/parser.c +++ b/runtime/parser.c @@ -274,6 +274,7 @@ finalize_it: RETiRet; } + /* Parse a received message. The object's rawmsg property is taken and * parsed according to the relevant standards. This can later be * extended to support configured parsers. @@ -284,6 +285,7 @@ rsRetVal parseMsg(msg_t *pMsg) DEFiRet; uchar *msg; int pri; + int lenMsg; int iPriText; CHKiRet(sanitizeMessage(pMsg)); @@ -292,8 +294,11 @@ rsRetVal parseMsg(msg_t *pMsg) DBGPRINTF("msg parser: flags %x, from '%s', msg '%s'\n", pMsg->msgFlags, pMsg->pszRcvFrom, pMsg->pszRawMsg); /* pull PRI */ - pri = DEFUPRI; + lenMsg = pMsg->iLenRawMsg; + if(lenMsg == 0) + ABORT_FINALIZE(RS_RET_EMPTY_MSG); msg = pMsg->pszRawMsg; + pri = DEFUPRI; iPriText = 0; if(*msg == '<') { /* while we process the PRI, we also fill the PRI textual representation @@ -301,7 +306,7 @@ rsRetVal parseMsg(msg_t *pMsg) * but it offers us performance... */ pri = 0; - while(isdigit((int) *++msg)) { + while(--lenMsg > 0 && isdigit((int) *++msg)) { pMsg->bufPRI[iPriText++ % 4] = *msg; /* mod 4 to guard against malformed messages! */ pri = 10 * pri + (*msg - '0'); } @@ -342,7 +347,7 @@ rsRetVal parseMsg(msg_t *pMsg) /* finalize message object */ pMsg->msgFlags &= ~NEEDS_PARSING; /* this message is now parsed */ - MsgPrepareEnqueue(pMsg); /* "historical" name - preparese for multi-threading */ + MsgPrepareEnqueue(pMsg); /* "historical" name - prepare for multi-threading */ finalize_it: RETiRet; |