diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-26 10:33:17 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-26 10:33:17 +0200 |
| commit | 8b50bdbee90d9bd00a78e776d5ade60d085c0823 (patch) | |
| tree | 52e05963642efc377f97e01ee01ba86f9846f98e | |
| parent | 376c4bd8435d10ac8ad38c61fb26047d98b0f107 (diff) | |
| parent | 244e4571849aef4ea0c26c398ba056ea7d641592 (diff) | |
| download | rsyslog-8b50bdbee90d9bd00a78e776d5ade60d085c0823.tar.gz rsyslog-8b50bdbee90d9bd00a78e776d5ade60d085c0823.tar.bz2 rsyslog-8b50bdbee90d9bd00a78e776d5ade60d085c0823.zip | |
Merge branch 'master' into master-var-refactor
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | grammar/rainerscript.c | 1 |
2 files changed, 4 insertions, 0 deletions
@@ -181,6 +181,9 @@ Version 7.5.0 [devel] 2013-06-11 Thanks to Axel Rau for the patch. --------------------------------------------------------------------------- Version 7.4.6 [v7.4-stable] 2013-11-?? +- bugfix: memory leak in strlen() RainerScript function + Thanks to Gregoire Seux for reportig this bug. + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=486 - bugfix: buffer overrun if re_extract function was called for submatch 50 Thanks to Pavel Levshin for reporting the problem and its location. - bugfix: memleak in re_extract() function diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c index f49d2aa1..e41efa04 100644 --- a/grammar/rainerscript.c +++ b/grammar/rainerscript.c @@ -1477,6 +1477,7 @@ doFuncCall(struct cnffunc *func, struct var *ret, void* usrptr) estr = var2String(&r[0], &bMustFree); ret->d.n = es_strlen(estr); if(bMustFree) es_deleteStr(estr); + if(r[0].datatype == 'S') es_deleteStr(r[0].d.estr); } ret->datatype = 'N'; break; |