Merge branch 'v3-stable' into beta

Conflicts:

	ChangeLog
	configure.ac
	doc/manual.html

2 files changed, 12 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 432ae299..5f6a0907 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -162,7 +162,12 @@ Version 3.19.0 (rgerhards), 2008-05-06
 - -c option no longer must be the first option - thanks to varmjofekoj
   for the patch
 ---------------------------------------------------------------------------
-Version 3.18.4 (rgerhards), 2008-09-??
+Version 3.18.5 (rgerhards), 2008-10-??
+- bugfix: imudp input module could cause segfault on HUP
+  It did not properly de-init a variable acting as a linked list head.
+  That resulted in trying to access freed memory blocks after the HUP.
+---------------------------------------------------------------------------
+Version 3.18.4 (rgerhards), 2008-09-18
 - bugfix: order-of magnitude issue with base-10 size definitions
   in config file parser. Could lead to invalid sizes, constraints
   etc for e.g. queue files and any other object whose size was specified
diff --git a/plugins/imudp/imudp.c b/plugins/imudp/imudp.c
index 6d3a075f..f8beb01f 100644
--- a/plugins/imudp/imudp.c
+++ b/plugins/imudp/imudp.c
@@ -245,10 +245,14 @@ CODESTARTafterRun
 		net.clearAllowedSenders (net.pAllowedSenders_UDP);
 		net.pAllowedSenders_UDP = NULL;
 	}
-	if(udpLstnSocks != NULL)
+	if(udpLstnSocks != NULL) {
 		net.closeUDPListenSockets(udpLstnSocks);
-	if(pRcvBuf != NULL)
+		udpLstnSocks = NULL;
+	}
+	if(pRcvBuf != NULL) {
 		free(pRcvBuf);
+		pRcvBuf = NULL;
+	}
 ENDafterRun