diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | plugins/mmnormalize/mmnormalize.c | 6 |
2 files changed, 6 insertions, 1 deletions
@@ -1,6 +1,7 @@ --------------------------------------------------------------------------- Version 7.3.5 [devel] 2012-11-?? - bugfix: mmnormalize build problems +- bugfix: mmnormalize could abort rsyslog if config parameter was in error --------------------------------------------------------------------------- Version 7.3.4 [devel] 2012-11-23 - further (and rather drastically) improved disk queue performance diff --git a/plugins/mmnormalize/mmnormalize.c b/plugins/mmnormalize/mmnormalize.c index 2d42886b..9dbde497 100644 --- a/plugins/mmnormalize/mmnormalize.c +++ b/plugins/mmnormalize/mmnormalize.c @@ -249,15 +249,18 @@ setInstParamDefaults(instanceData *pData) BEGINnewActInst struct cnfparamvals *pvals; int i; + int bDestructPValsOnExit; CODESTARTnewActInst DBGPRINTF("newActInst (mmnormalize)\n"); + bDestructPValsOnExit = 0; pvals = nvlstGetParams(lst, &actpblk, NULL); if(pvals == NULL) { errmsg.LogError(0, RS_RET_MISSING_CNFPARAMS, "mmnormalize: error reading " "config parameters"); ABORT_FINALIZE(RS_RET_MISSING_CNFPARAMS); } + bDestructPValsOnExit = 1; if(Debug) { dbgprintf("action param blk in mmnormalize:\n"); @@ -284,7 +287,8 @@ CODESTARTnewActInst iRet = buildInstance(pData); CODE_STD_FINALIZERnewActInst - cnfparamvalsDestruct(pvals, &actpblk); + if(bDestructPValsOnExit) + cnfparamvalsDestruct(pvals, &actpblk); ENDnewActInst |