summaryrefslogtreecommitdiffstats
path: root/grammar/rainerscript.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-10-18 07:02:27 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-10-18 07:02:27 +0200
commitdc1f81addfd428fca2c8115ebbfdb2e8a26d8375 (patch)
tree87962f907f8dd900137925e5869c4ed6b67fac66 /grammar/rainerscript.c
parentcc66470d2f9abf1746fa210403b99c50eb6f59d9 (diff)
downloadrsyslog-dc1f81addfd428fca2c8115ebbfdb2e8a26d8375.tar.gz
rsyslog-dc1f81addfd428fca2c8115ebbfdb2e8a26d8375.tar.bz2
rsyslog-dc1f81addfd428fca2c8115ebbfdb2e8a26d8375.zip
bugfix: segfault if re_extract() function was used and no match found
Diffstat (limited to 'grammar/rainerscript.c')
-rw-r--r--grammar/rainerscript.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c
index f4833679..f9c5047c 100644
--- a/grammar/rainerscript.c
+++ b/grammar/rainerscript.c
@@ -1315,7 +1315,10 @@ finalize_it:
if(bHadNoMatch) {
cnfexprEval(func->expr[4], &r[4], usrptr);
estr = var2String(&r[4], &bMustFree);
- if(r[4].datatype == 'S') es_deleteStr(r[4].d.estr);
+ /* Note that we do NOT free the string that was returned/created
+ * for r[4]. We pass it to the caller, which in turn frees it.
+ * This saves us doing one unnecessary memory alloc & write.
+ */
}
ret->datatype = 'S';
ret->d.estr = estr;