summaryrefslogtreecommitdiffstats
path: root/runtime/msg.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-10-26 12:23:17 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-10-26 12:23:17 +0100
commit5e4f9d5e65d7c0db640f275d5cfb05371b697776 (patch)
tree8ea1e7c05ef015019b4da0cfd27edc6427b960f5 /runtime/msg.c
parentda53802c96a59a990859706219398dce709ba1b3 (diff)
parent6be07a8f8a3b9b7baf77e42639473e9b1a990e29 (diff)
downloadrsyslog-5e4f9d5e65d7c0db640f275d5cfb05371b697776.tar.gz
rsyslog-5e4f9d5e65d7c0db640f275d5cfb05371b697776.tar.bz2
rsyslog-5e4f9d5e65d7c0db640f275d5cfb05371b697776.zip
Merge branch 'master' into queuePartialDeleteBatches
Diffstat (limited to 'runtime/msg.c')
-rw-r--r--runtime/msg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/msg.c b/runtime/msg.c
index 6d5b9cee..623c5b4a 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -288,7 +288,7 @@ static inline void
getInputName(msg_t *pM, uchar **ppsz, int *plen)
{
BEGINfunc
- if(pM == NULL) {
+ if(pM == NULL || pM->pInputName == NULL) {
*ppsz = UCHAR_CONSTANT("");
*plen = 0;
} else {