bugfix: fixed some segaults on Solaris

where vsprintf() does not check for NULL pointers

3 files changed, 3 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 0cbe7bba..1dbd69e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@ Version 4.1.6  [DEVEL] (rgerhards), 2009-03-??
 - improved omfile so that it properly suspends itself if there is an
   i/o or file name generation error. This enables it to be used with
   the full high availability features of rsyslog's engine
+- bugfix: fixed some segaults on Solaris, where vsprintf() does not
+  check for NULL pointers
 ---------------------------------------------------------------------------
 Version 4.1.5  [DEVEL] (rgerhards), 2009-03-11
 - bugfix: parser did not correctly parse fields in UDP-received messages
diff --git a/tools/omfwd.c b/tools/omfwd.c
index 1dd184ef..7a945ce0 100644
--- a/tools/omfwd.c
+++ b/tools/omfwd.c
@@ -615,7 +615,6 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1)
 	} else {
 		CHKmalloc(pData->f_hname = strdup((char*) q));
 	}
-dbgprintf("hostname '%s', port '%s'\n", pData->f_hname, pData->port);
 
 	/* process template */
 	CHKiRet(cflineParseTemplateName(&p, *ppOMSR, 0, OMSR_NO_RQD_TPL_OPTS,
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 235bc52e..a2aead9a 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -3475,7 +3475,7 @@ int realMain(int argc, char **argv)
 	/* END core initializations - we now come back to carrying out command line options*/
 
 	while((iRet = bufOptRemove(&ch, &arg)) == RS_RET_OK) {
-		dbgprintf("deque option %c, optarg '%s'\n", ch, arg);
+		dbgprintf("deque option %c, optarg '%s'\n", ch, (arg == NULL) ? "" : arg);
 		switch((char)ch) {
                 case '4':
 	                glbl.SetDefPFFamily(PF_INET);