summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-09-22 15:50:03 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-09-22 15:50:03 +0200
commitf0732cb75b237f6a853dadb0c6cff5d6bef62952 (patch)
tree77f4e493a0b59abfca9c14998f3071343f2089e5
parentbcb97650683bbcb1ecdacd0c2a6052ef836d3eda (diff)
parent1b2270ad3a6a78b1d11a7f7639208a42aabce578 (diff)
downloadrsyslog-f0732cb75b237f6a853dadb0c6cff5d6bef62952.tar.gz
rsyslog-f0732cb75b237f6a853dadb0c6cff5d6bef62952.tar.xz
rsyslog-f0732cb75b237f6a853dadb0c6cff5d6bef62952.zip
Merge branch 'beta'
-rw-r--r--ChangeLog7
-rw-r--r--plugins/imudp/imudp.c8
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1995ca10..72ae5dfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -255,7 +255,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 64413e45..5792a999 100644
--- a/plugins/imudp/imudp.c
+++ b/plugins/imudp/imudp.c
@@ -248,10 +248,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