summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-03-16 17:02:49 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-03-16 17:02:49 +0100
commit219336ec5a560a472f7b4e1d60a42e13685e9a5c (patch)
tree64c4f4ef90997d845dff15b3ff2b24f033af0da0 /tools
parent4cb3e80152ed4674ed370915f7c02889b5bfb6f3 (diff)
downloadrsyslog-219336ec5a560a472f7b4e1d60a42e13685e9a5c.tar.gz
rsyslog-219336ec5a560a472f7b4e1d60a42e13685e9a5c.tar.xz
rsyslog-219336ec5a560a472f7b4e1d60a42e13685e9a5c.zip
bugfix: recent patch to fix small memory leak could cause invalid free.
This could only happen during config file parsing.
Diffstat (limited to 'tools')
-rw-r--r--tools/omfwd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/omfwd.c b/tools/omfwd.c
index a6d83eb9..cbfc36a4 100644
--- a/tools/omfwd.c
+++ b/tools/omfwd.c
@@ -411,7 +411,7 @@ CODESTARTtryResume
ENDtryResume
BEGINdoAction
- char *psz; /* temporary buffering */
+ char *psz = NULL; /* temporary buffering */
register unsigned l;
int iMaxLine;
CODESTARTdoAction
@@ -487,7 +487,7 @@ CODESTARTdoAction
}
finalize_it:
# ifdef USE_NETZIP
- if(psz != (char*) ppString[0]) {
+ if((psz != NULL) && (psz != (char*) ppString[0])) {
/* we need to free temporary buffer, alloced above - Naoya Nakazawa, 2010-01-11 */
free(psz);
}