summaryrefslogtreecommitdiffstats
path: root/plugins/omgssapi/omgssapi.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-03-29 11:07:15 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-03-29 11:07:15 +0200
commit8b9cef552de558ecfd130451c4dea22676184d38 (patch)
treed3b40f3bfc34f32bffbc08668dddd6c4e1a724d3 /plugins/omgssapi/omgssapi.c
parentde7726cbf0957384cc9261ac47d6bf65906739b5 (diff)
parentb6ce75cb6ce65a468f9551d98a641b407a4f2630 (diff)
downloadrsyslog-8b9cef552de558ecfd130451c4dea22676184d38.tar.gz
rsyslog-8b9cef552de558ecfd130451c4dea22676184d38.tar.xz
rsyslog-8b9cef552de558ecfd130451c4dea22676184d38.zip
Merge branch 'v4-stable' into v5-stable
Conflicts: ChangeLog configure.ac doc/manual.html runtime/debug.c runtime/stream.c tests/Makefile.am tests/diskqueue.sh tests/nettester.c tools/omfile.c
Diffstat (limited to 'plugins/omgssapi/omgssapi.c')
-rw-r--r--plugins/omgssapi/omgssapi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/omgssapi/omgssapi.c b/plugins/omgssapi/omgssapi.c
index 08aaad80..605e5ed9 100644
--- a/plugins/omgssapi/omgssapi.c
+++ b/plugins/omgssapi/omgssapi.c
@@ -377,7 +377,7 @@ CODESTARTtryResume
ENDtryResume
BEGINdoAction
- char *psz; /* temporary buffering */
+ char *psz = NULL; /* temporary buffering */
register unsigned l;
int iMaxLine;
CODESTARTdoAction
@@ -454,7 +454,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);
}