From b6d350ab9c212923dcfcf3b160af83b3c078f1bc Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 15 Jul 2013 15:22:59 +0200 Subject: fix regression that caused freeInstance not to be correctly called was introduced July, 5th 2013 by commit 8ee2b0b1610fbf4dff20453d188f379583410b42 --- grammar/rainerscript.c | 2 +- grammar/rainerscript.h | 2 +- runtime/ruleset.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c index e3e7cb32..0f0b469c 100644 --- a/grammar/rainerscript.c +++ b/grammar/rainerscript.c @@ -2450,7 +2450,7 @@ cnfstmtNew(unsigned s_type) void cnfstmtDestructLst(struct cnfstmt *root); /* delete a single stmt */ -void +static void cnfstmtDestruct(struct cnfstmt *stmt) { switch(stmt->nodetype) { diff --git a/grammar/rainerscript.h b/grammar/rainerscript.h index 31b2eb93..d00cc4c3 100644 --- a/grammar/rainerscript.h +++ b/grammar/rainerscript.h @@ -331,7 +331,7 @@ struct cnfstmt * cnfstmtNewSet(char *var, struct cnfexpr *expr); struct cnfstmt * cnfstmtNewUnset(char *var); struct cnfstmt * cnfstmtNewCall(es_str_t *name); struct cnfstmt * cnfstmtNewContinue(void); -void cnfstmtDestruct(struct cnfstmt *root); +void cnfstmtDestructLst(struct cnfstmt *root); void cnfstmtOptimize(struct cnfstmt *root); struct cnfarray* cnfarrayNew(es_str_t *val); struct cnfarray* cnfarrayDup(struct cnfarray *old); diff --git a/runtime/ruleset.c b/runtime/ruleset.c index e3348938..5bf7ac03 100644 --- a/runtime/ruleset.c +++ b/runtime/ruleset.c @@ -742,7 +742,7 @@ CODESTARTobjDestruct(ruleset) parser.DestructParserList(&pThis->pParserLst); } free(pThis->pszName); - cnfstmtDestruct(pThis->root); + cnfstmtDestructLst(pThis->root); ENDobjDestruct(ruleset) @@ -952,7 +952,7 @@ rulesetProcessCnf(struct cnfobj *o) errmsg.LogError(0, RS_RET_RULESET_EXISTS, "error: ruleset '%s' specified more than once", rsName); - cnfstmtDestruct(o->script); + cnfstmtDestructLst(o->script); ABORT_FINALIZE(RS_RET_RULESET_EXISTS); } else if(localRet != RS_RET_NOT_FOUND) { ABORT_FINALIZE(localRet); -- cgit v1.2.3