summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-03-27 15:14:45 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-03-27 15:14:45 +0100
commit05478639e36aa588f6033f0664a448aa04f16c32 (patch)
tree4a8f55ca2766c179dcc21040b147ecdf9e719083
parentd1b8821be796694f123f3e469eaaedbe228fde66 (diff)
downloadrsyslog-05478639e36aa588f6033f0664a448aa04f16c32.tar.gz
rsyslog-05478639e36aa588f6033f0664a448aa04f16c32.tar.bz2
rsyslog-05478639e36aa588f6033f0664a448aa04f16c32.zip
bugfix: imuxsock aborted under some conditions
regression from ratelimiting enhancements
-rw-r--r--ChangeLog4
-rw-r--r--plugins/imuxsock/imuxsock.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c64fe0f9..01ba0f45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
---------------------------------------------------------------------------
+Version 7.3.10 [devel] 2013-04-??
+- bugfix: imuxsock aborted under some conditions
+ regression from ratelimiting enhancements
+---------------------------------------------------------------------------
Version 7.3.9 [devel] 2013-03-27
- support for signing logs added
- imudp: now supports user-selectable inputname
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
index f15773fc..0f4ded1d 100644
--- a/plugins/imuxsock/imuxsock.c
+++ b/plugins/imuxsock/imuxsock.c
@@ -570,6 +570,10 @@ findRatelimiter(lstn_t *pLstn, struct ucred *cred, ratelimit_t **prl)
FINALIZE;
}
#endif
+ if(pLstn->ht == NULL) {
+ *prl = NULL;
+ FINALIZE;
+ }
rl = hashtable_search(pLstn->ht, &cred->pid);
if(rl == NULL) {