summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-06-27 15:14:09 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-06-27 15:14:09 +0200
commit50fc430ccd4305645007327c31026fb4e12fc6f5 (patch)
tree9dc9827727fac33ecd765a511661664d7db58837
parent752e1c4b863346fe6eb8b6bc66d1d3bc3d346d13 (diff)
downloadrsyslog-50fc430ccd4305645007327c31026fb4e12fc6f5.tar.gz
rsyslog-50fc430ccd4305645007327c31026fb4e12fc6f5.tar.bz2
rsyslog-50fc430ccd4305645007327c31026fb4e12fc6f5.zip
bugfix: in RFC5425 TLS, multiple wildcards in auth could cause segfault
-rw-r--r--ChangeLog1
-rw-r--r--runtime/net.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e675e589..cb93bda0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
---------------------------------------------------------------------------
Version 7.4.2 [v7.4-stable] 2013-06-??
+- bugfix: in RFC5425 TLS, multiple wildcards in auth could cause segfault
- bugfix: RainerScript object required parameters were not properly
checked - this clould result to segfaults on startup if parameters
were missing.
diff --git a/runtime/net.c b/runtime/net.c
index b291213e..13391cc0 100644
--- a/runtime/net.c
+++ b/runtime/net.c
@@ -232,6 +232,7 @@ finalize_it:
/* enqueue the element */
if(pPeer->pWildcardRoot == NULL) {
pPeer->pWildcardRoot = pNew;
+ pPeer->pWildcardLast = pNew;
} else {
pPeer->pWildcardLast->pNext = pNew;
}