diff options
| author | oxpa <iippolitov@gmail.com> | 2012-11-02 17:00:58 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-02 17:00:58 +0100 |
| commit | ec314dabec6cedddb26340c8321f6e59fa29f507 (patch) | |
| tree | 8a94d1fbb573a22677bd49bfa3243afbb118ecb8 | |
| parent | 0bde71bdb79c11fe3c7513048bd48dad24c02de2 (diff) | |
| download | rsyslog-ec314dabec6cedddb26340c8321f6e59fa29f507.tar.gz rsyslog-ec314dabec6cedddb26340c8321f6e59fa29f507.tar.bz2 rsyslog-ec314dabec6cedddb26340c8321f6e59fa29f507.zip | |
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
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | grammar/rainerscript.c | 1 |
2 files changed, 3 insertions, 1 deletions
@@ -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: |