summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-05-29 12:35:13 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-05-29 12:35:13 +0200
commit95d9202c099a1bf00a291c384b31d614168ecbb2 (patch)
treeacdcf316e350d1919f595a320619ffdeefdda269
parent6bc629021eb008e1d48627bdac70b1c8b237937b (diff)
downloadrsyslog-95d9202c099a1bf00a291c384b31d614168ecbb2.tar.gz
rsyslog-95d9202c099a1bf00a291c384b31d614168ecbb2.tar.xz
rsyslog-95d9202c099a1bf00a291c384b31d614168ecbb2.zip
bugfix: invalid free in imptcp could lead to abort during startup
-rw-r--r--ChangeLog1
-rw-r--r--plugins/imptcp/imptcp.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2846a59d..985287da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
---------------------------------------------------------------------------
Version 6.3.10 [BETA] 2012-0?-??
+- bugfix: invalid free in imptcp could lead to abort during startup
- bugfix: if debug message could end up in log file when forking
if rsyslog was set to auto-background (thus fork, the default) and debug
mode to stdout was enabled, debug messages ended up in the first log file
diff --git a/plugins/imptcp/imptcp.c b/plugins/imptcp/imptcp.c
index ba323a94..90216b5b 100644
--- a/plugins/imptcp/imptcp.c
+++ b/plugins/imptcp/imptcp.c
@@ -1362,6 +1362,8 @@ CODESTARTendCnfLoad
/* free legacy config vars */
free(cs.pszInputName);
free(cs.lstnIP);
+ cs.pszInputName = NULL;
+ cs.lstnIP = NULL;
ENDendCnfLoad