From ec314dabec6cedddb26340c8321f6e59fa29f507 Mon Sep 17 00:00:00 2001 From: oxpa Date: Fri, 2 Nov 2012 17:00:58 +0100 Subject: 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 --- ChangeLog | 3 +++ grammar/rainerscript.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) 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: -- cgit v1.2.3 From a3742bdffd0622e8cc151accaadf1a433c0720fd Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Fri, 2 Nov 2012 19:05:05 +0100 Subject: bugfix: potential abort of imtcp on rsyslogd shutdown --- ChangeLog | 1 + plugins/imtcp/imtcp.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b190f03..f4862959 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ Version 7.2.2 [v7-stable] 2012-10-?? - 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/plugins/imtcp/imtcp.c b/plugins/imtcp/imtcp.c index eaf9a213..0cecb704 100644 --- a/plugins/imtcp/imtcp.c +++ b/plugins/imtcp/imtcp.c @@ -550,9 +550,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); -- cgit v1.2.3