diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-21 17:45:39 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-21 17:45:39 +0200 |
| commit | 052f8e2ef64ca039219ac83a9d9372f3eb3a5aed (patch) | |
| tree | d2671048393a397a28a1b8ebe39088c4bcfa8da6 /runtime | |
| parent | 35b71135033e1be0c7759167d8151533f98b93e9 (diff) | |
| download | rsyslog-052f8e2ef64ca039219ac83a9d9372f3eb3a5aed.tar.gz rsyslog-052f8e2ef64ca039219ac83a9d9372f3eb3a5aed.tar.xz rsyslog-052f8e2ef64ca039219ac83a9d9372f3eb3a5aed.zip | |
bugfix: abort in omfile (in brand-new code)
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/module-template.h | 3 | ||||
| -rw-r--r-- | runtime/rsconf.c | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/runtime/module-template.h b/runtime/module-template.h index 6238d0f4..d360447a 100644 --- a/runtime/module-template.h +++ b/runtime/module-template.h @@ -325,7 +325,8 @@ static rsRetVal newActInst(uchar __attribute__((unused)) *modName, \ struct nvlst *lst, void **ppModData, omodStringRequest_t **ppOMSR)\ {\ DEFiRet;\ - instanceData *pData = NULL; + instanceData *pData = NULL; \ + *ppOMSR = NULL; #define CODESTARTnewActInst \ diff --git a/runtime/rsconf.c b/runtime/rsconf.c index e85597f8..c4a0ed51 100644 --- a/runtime/rsconf.c +++ b/runtime/rsconf.c @@ -231,8 +231,12 @@ cnfDoActlst(struct cnfactlst *actlst, rule_t *pRule) dbgprintf("aclst %p: ", actlst); if(actlst->actType == CNFACT_V2) { dbgprintf("v6+ action object\n"); - actionNewInst(actlst->data.lst, &pAction); - iRet = llAppend(&(pRule)->llActList, NULL, (void*) pAction); + if(actionNewInst(actlst->data.lst, &pAction) == RS_RET_OK) { + iRet = llAppend(&(pRule)->llActList, NULL, (void*) pAction); + } else { + errmsg.LogError(0, RS_RET_ERR, "errors occured in file '%s' " + "around line %d", actlst->cnfFile, actlst->lineno); + } } else { dbgprintf("legacy action line:%s\n", actlst->data.legActLine); str = (uchar*) actlst->data.legActLine; |