diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-02 19:05:05 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-02 19:05:05 +0100 |
| commit | a3742bdffd0622e8cc151accaadf1a433c0720fd (patch) | |
| tree | 0c17d617c5fca4044e319882648a9303e315529a | |
| parent | ec314dabec6cedddb26340c8321f6e59fa29f507 (diff) | |
| download | rsyslog-a3742bdffd0622e8cc151accaadf1a433c0720fd.tar.gz rsyslog-a3742bdffd0622e8cc151accaadf1a433c0720fd.tar.bz2 rsyslog-a3742bdffd0622e8cc151accaadf1a433c0720fd.zip | |
bugfix: potential abort of imtcp on rsyslogd shutdown
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | plugins/imtcp/imtcp.c | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -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); |