diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-22 15:50:22 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-22 15:50:22 +0200 |
| commit | 48555f70c7f6020241b001d5dc7a2b6d2275d85f (patch) | |
| tree | 2c6a2f7e3d898e03e9b153def800be2a685885e8 | |
| parent | bc70a730194759e85f9c3641573c46b4a8476198 (diff) | |
| parent | f0732cb75b237f6a853dadb0c6cff5d6bef62952 (diff) | |
| download | rsyslog-48555f70c7f6020241b001d5dc7a2b6d2275d85f.tar.gz rsyslog-48555f70c7f6020241b001d5dc7a2b6d2275d85f.tar.xz rsyslog-48555f70c7f6020241b001d5dc7a2b6d2275d85f.zip | |
Merge branch 'master' into helgrind
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | plugins/imudp/imudp.c | 8 |
2 files changed, 12 insertions, 3 deletions
@@ -262,7 +262,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 |