summaryrefslogtreecommitdiffstats
path: root/runtime/msg.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-10-26 10:09:04 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-10-26 10:09:04 +0100
commit6be07a8f8a3b9b7baf77e42639473e9b1a990e29 (patch)
treedade763f274a4a035cd6fed684c7eeb17599e37e /runtime/msg.c
parenteb5cb72ec4cb4ac5d7f13855ac4dac9b6927078c (diff)
downloadrsyslog-6be07a8f8a3b9b7baf77e42639473e9b1a990e29.tar.gz
rsyslog-6be07a8f8a3b9b7baf77e42639473e9b1a990e29.tar.xz
rsyslog-6be07a8f8a3b9b7baf77e42639473e9b1a990e29.zip
bugfix: potential abort if inputname property was not set
primarily a problem of imdiag. Also added some fix for a potential situation during cancel processing. That one is not considered vital and may later be removed again.
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 {