diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-29 12:35:25 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-29 12:35:25 +0200 |
| commit | 4ae8e518d21dfb495a5e5f6fcfe783adac27bab7 (patch) | |
| tree | 6c4f82480a9a08dce3dcc058c38faa50b36c7d8f | |
| parent | 04399f5ebe22d4f0c228fceb6766f33a49892e38 (diff) | |
| parent | 95d9202c099a1bf00a291c384b31d614168ecbb2 (diff) | |
| download | rsyslog-4ae8e518d21dfb495a5e5f6fcfe783adac27bab7.tar.gz rsyslog-4ae8e518d21dfb495a5e5f6fcfe783adac27bab7.tar.bz2 rsyslog-4ae8e518d21dfb495a5e5f6fcfe783adac27bab7.zip | |
Merge branch 'beta'
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | plugins/imptcp/imptcp.c | 2 |
2 files changed, 3 insertions, 0 deletions
@@ -5,6 +5,7 @@ Version 6.5.0 [devel] 2012-0?-?? in some speedup (but serious loss of debugging capabilities) --------------------------------------------------------------------------- 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 |