bugfix: abort condition when RecvFrom was not set and message reduction was on

Happend e.g. with imuxsock.

2 files changed, 14 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 2e5e3296..3a17f28e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 ---------------------------------------------------------------------------
 Version 4.5.1  [DEVEL] (rgerhards), 2009-07-??
+- bugfix: abort condition when RecvFrom was not set and message reduction
+  was on. Happend e.g. with imuxsock.
 - added $klogConsoleLogLevel directive which permits to set a new
   console log level while rsyslog is active
 ---------------------------------------------------------------------------
diff --git a/runtime/msg.c b/runtime/msg.c
index 6c272d1f..0ce84f35 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -864,12 +864,18 @@ msg_t* MsgDup(msg_t* pOld)
 	pNew->iProtocolVersion = pOld->iProtocolVersion;
 	pNew->ttGenTime = pOld->ttGenTime;
 	pNew->offMSG = pOld->offMSG;
-	pNew->pRcvFrom = pOld->pRcvFrom;
-	prop.AddRef(pNew->pRcvFrom);
-	pNew->pRcvFromIP = pOld->pRcvFromIP;
-	prop.AddRef(pNew->pRcvFromIP);
-	pNew->pInputName = pOld->pInputName;
-	prop.AddRef(pNew->pInputName);
+	if(pOld->pRcvFrom != NULL) {
+		pNew->pRcvFrom = pOld->pRcvFrom;
+		prop.AddRef(pNew->pRcvFrom);
+	}
+	if(pOld->pRcvFromIP != NULL) {
+		pNew->pRcvFromIP = pOld->pRcvFromIP;
+		prop.AddRef(pNew->pRcvFromIP); /* XXX */
+	}
+	if(pOld->pInputName != NULL) {
+		pNew->pInputName = pOld->pInputName;
+		prop.AddRef(pNew->pInputName);
+	}
 	/* enable this, if someone actually uses UxTradMsg, delete after some time has
 	 * passed and nobody complained -- rgerhards, 2009-06-16
 	pNew->offAfterPRI = pOld->offAfterPRI;