diff options
| author | Michael Biebl <biebl@debian.org> | 2010-04-07 12:11:52 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2010-04-07 12:11:52 +0200 |
| commit | 0c3924200ff23e6444058f01b2b7446cde6e1581 (patch) | |
| tree | 08967d6f21a0f578d03a92a802343a1313450534 /plugins | |
| parent | 4af6f89dda61bb5acd862b805302542d9c0da005 (diff) | |
| download | rsyslog-0c3924200ff23e6444058f01b2b7446cde6e1581.tar.gz | |
Imported Upstream version 4.6.2upstream/4.6.2
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/imudp/imudp.c | 2 | ||||
| -rw-r--r-- | plugins/omgssapi/omgssapi.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/imudp/imudp.c b/plugins/imudp/imudp.c index 0970259..f8555f0 100644 --- a/plugins/imudp/imudp.c +++ b/plugins/imudp/imudp.c @@ -241,7 +241,7 @@ processSocket(int fd, struct sockaddr_storage *frominetPrev, int *pbIsPermitted, } } - DBGPRINTF("recv(%d,%d)/%s,acl:%d,msg:%.80s\n", fd, (int) lenRcvBuf, fromHost, *pbIsPermitted, pRcvBuf); + DBGPRINTF("recv(%d,%d)/%s,acl:%d,msg:%s\n", fd, (int) lenRcvBuf, fromHost, *pbIsPermitted, pRcvBuf); if(*pbIsPermitted) { if((iTimeRequery == 0) || (iNbrTimeUsed++ % iTimeRequery) == 0) { diff --git a/plugins/omgssapi/omgssapi.c b/plugins/omgssapi/omgssapi.c index d9f80c1..782ac22 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); } |