summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrégory Nuyttens <gregory.nuyttens@gmail.com>2013-09-13 13:20:10 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-09-13 13:20:10 +0200
commit0bc9755717187f2341a7e05e456b1c2a00ed567c (patch)
treeaf49e109f00f6a0ed9d448f5a2930fc4e8f17f33
parent5a09d0915baf292a1bfc3011668759534264a29a (diff)
downloadrsyslog-0bc9755717187f2341a7e05e456b1c2a00ed567c.tar.gz
rsyslog-0bc9755717187f2341a7e05e456b1c2a00ed567c.tar.bz2
rsyslog-0bc9755717187f2341a7e05e456b1c2a00ed567c.zip
bugfix: small memory leak in imfile when $ResetConfigVariables was used
Thanks to Grégory Nuyttens for reporting this bug and providig a fix
-rw-r--r--ChangeLog2
-rw-r--r--plugins/imfile/imfile.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index afbc84a4..2d7682a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
---------------------------------------------------------------------------
Version 7.4.5 [v7.4-stable] 2013-09-??
+- bugfix: small memory leak in imfile when $ResetConfigVariables was used
+ Thanks to Grégory Nuyttens for reporting this bug and providig a fix
- bugfix: segfault on startup if TLS was used but no CA cert set
- bugfix: segfault on startup if TCP TLS was used but no cert or key set
- bugfix: some more build problems with newer json-c versions
diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c
index 45882fb2..66ed8bc4 100644
--- a/plugins/imfile/imfile.c
+++ b/plugins/imfile/imfile.c
@@ -832,8 +832,8 @@ resetConfigVariables(uchar __attribute__((unused)) *pp, void __attribute__((unus
cs.pszFileName = NULL;
free(cs.pszFileTag);
cs.pszFileTag = NULL;
- free(cs.pszFileTag);
- cs.pszFileTag = NULL;
+ free(cs.pszStateFile);
+ cs.pszStateFile = NULL;
/* set defaults... */
cs.iPollInterval = DFLT_PollInterval;