summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--grammar/rainerscript.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 665b2d35..9b190f03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
----------------------------------------------------------------------------
Version 7.2.2 [v7-stable] 2012-10-??
- bugfix: omfwd did not properly support "template" parameter
+- bugfix: potential segfault when re_match() function was used
+ Thanks to oxpa for the patch.
+ closes: http://bugzilla.adiscon.com/show_bug.cgi?id=371
- bugfix: imzmq3 segfault with PULL subscription
Thanks to Martin Nilsson for the patch.
----------------------------------------------------------------------------
diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c
index 733ebef4..36254632 100644
--- a/grammar/rainerscript.c
+++ b/grammar/rainerscript.c
@@ -1099,7 +1099,6 @@ doFuncCall(struct cnffunc *func, struct var *ret, void* usrptr)
}
ret->datatype = 'N';
if(bMustFree) free(str);
- free(str);
if(r[0].datatype == 'S') es_deleteStr(r[0].d.estr);
break;
case CNFFUNC_FIELD: