diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-02 19:05:27 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-02 19:05:27 +0100 |
| commit | 8c32e9d36f1fc5476f4711905104970db345b3f9 (patch) | |
| tree | 982b2ad71dcc1d0084214f7c14aad1f5ff36ada0 | |
| parent | ceb155075b1dd7775beb98d01a71046a9cbc7ddf (diff) | |
| parent | a3742bdffd0622e8cc151accaadf1a433c0720fd (diff) | |
| download | rsyslog-8c32e9d36f1fc5476f4711905104970db345b3f9.tar.gz rsyslog-8c32e9d36f1fc5476f4711905104970db345b3f9.tar.bz2 rsyslog-8c32e9d36f1fc5476f4711905104970db345b3f9.zip | |
Merge branch 'v7-stable'
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | grammar/rainerscript.c | 1 | ||||
| -rw-r--r-- | plugins/imtcp/imtcp.c | 6 |
3 files changed, 7 insertions, 4 deletions
@@ -50,6 +50,10 @@ Version 7.3.0 [devel] 2012-10-09 ---------------------------------------------------------------------------- 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: potential abort of imtcp on rsyslogd shutdown - 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: diff --git a/plugins/imtcp/imtcp.c b/plugins/imtcp/imtcp.c index 8d71d5f2..8750eb59 100644 --- a/plugins/imtcp/imtcp.c +++ b/plugins/imtcp/imtcp.c @@ -561,9 +561,9 @@ ENDactivateCnf BEGINfreeCnf instanceConf_t *inst, *del; CODESTARTfreeCnf - if(runModConf->permittedPeers != NULL) { - cnfarrayContentDestruct(runModConf->permittedPeers); - free(runModConf->permittedPeers); + if(pModConf->permittedPeers != NULL) { + cnfarrayContentDestruct(pModConf->permittedPeers); + free(pModConf->permittedPeers); } for(inst = pModConf->root ; inst != NULL ; ) { free(inst->pszBindPort); |