diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-13 13:20:44 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-13 13:20:44 +0200 |
| commit | 2e4334e36c1680f76698452e05d64c772b7ec323 (patch) | |
| tree | 646bb016bead18b8360fb69407e0e059a6a96ece | |
| parent | c8ba2749b60eb020fb944bb338d4d2e35f71e351 (diff) | |
| parent | 0bc9755717187f2341a7e05e456b1c2a00ed567c (diff) | |
| download | rsyslog-2e4334e36c1680f76698452e05d64c772b7ec323.tar.gz rsyslog-2e4334e36c1680f76698452e05d64c772b7ec323.tar.bz2 rsyslog-2e4334e36c1680f76698452e05d64c772b7ec323.zip | |
Merge branch 'v7-stable'
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | plugins/imfile/imfile.c | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -96,6 +96,8 @@ Version 7.5.0 [devel] 2013-06-11 Thanks to Axel Rau for the patch. --------------------------------------------------------------------------- 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 44209047..9f6fd644 100644 --- a/plugins/imfile/imfile.c +++ b/plugins/imfile/imfile.c @@ -840,8 +840,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; |