rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-17 05:50:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixing segfault caused by all inputs but imudp

Browse Source
This commit is contained in:
Rainer Gerhards 2008-10-09 07:48:22 +02:00
parent ace4f2f752
commit 5742f9cdd0
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
runtime/msg.c
View File

@ -264,6 +264,7 @@ static inline rsRetVal msgBaseConstruct(msg_t **ppThis)
/* initialize members that are non-zero */ /* initialize members that are non-zero */
pM->iRefCount = 1; pM->iRefCount = 1;
pM->bIsParsed = 1; /* first we assume this is parsed. If not, input must re-set to 0 */
pM->iSeverity = -1; pM->iSeverity = -1;
pM->iFacility = -1; pM->iFacility = -1;
objConstructSetObjInfo(pM); objConstructSetObjInfo(pM);

3
tools/syslogd.c
View File

@ -597,13 +597,13 @@ static inline rsRetVal printline(uchar *hname, uchar *hnameIP, uchar *msg, int b
int pri; int pri;
msg_t *pMsg; msg_t *pMsg;
pMsg->bIsParsed = 1; /* this is a hack until this function can be removed TODO: do it soon (rgerhards, 2008-10-09)! */
/* Now it is time to create the message object (rgerhards) */ /* Now it is time to create the message object (rgerhards) */
if(stTime == NULL) { if(stTime == NULL) {
CHKiRet(msgConstruct(&pMsg)); CHKiRet(msgConstruct(&pMsg));
} else { } else {
CHKiRet(msgConstructWithTime(&pMsg, stTime, ttGenTime)); CHKiRet(msgConstructWithTime(&pMsg, stTime, ttGenTime));
} }
pMsg->bIsParsed = 1; /* this is a hack until this function can be removed TODO: do it soon (rgerhards, 2008-10-09)! */
if(pszInputName != NULL) if(pszInputName != NULL)
MsgSetInputName(pMsg, (char*) pszInputName); MsgSetInputName(pMsg, (char*) pszInputName);
MsgSetFlowControlType(pMsg, flowCtlType); MsgSetFlowControlType(pMsg, flowCtlType);
@ -1192,6 +1192,7 @@ msgConsumer(void __attribute__((unused)) *notNeeded, void *pUsr)
assert(pMsg != NULL); assert(pMsg != NULL);
RUNLOG_VAR("%d", pMsg->bIsParsed);
if(pMsg->bIsParsed == 0) { if(pMsg->bIsParsed == 0) {
parseMsg(pMsg); parseMsg(pMsg);
} }