summaryrefslogtreecommitdiffstats
path: root/tools/omfwd.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-03-23 07:10:03 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-03-23 07:10:03 +0100
commitd2f242edcb25e69ae7de5a142229330070f2e70b (patch)
tree8f25fa8de784c877cda4c17452955234cdc2f95e /tools/omfwd.c
parent396e211e5cfd195b7135947d425b089a0447fa88 (diff)
parent2f1d5a12037453792eb1000c79daf737b41c5ba4 (diff)
downloadrsyslog-d2f242edcb25e69ae7de5a142229330070f2e70b.tar.gz
rsyslog-d2f242edcb25e69ae7de5a142229330070f2e70b.tar.xz
rsyslog-d2f242edcb25e69ae7de5a142229330070f2e70b.zip
Merge branch 'v4-stable' into v4-stable-solaris
Diffstat (limited to 'tools/omfwd.c')
-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);
}