diff options
| author | Martin Nilsson <Martin.Nilsson@securitas-direct.com> | 2012-10-30 16:30:18 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-30 16:30:18 +0100 |
| commit | 2492552dc8b320e299a51241c5960c0bef67ed1f (patch) | |
| tree | 5b4d5f11cfcec3597397253aca11c2f6810e73bb | |
| parent | ad1b93df8a83563c23d44ea0df910dd25d26a9d9 (diff) | |
| download | rsyslog-2492552dc8b320e299a51241c5960c0bef67ed1f.tar.gz rsyslog-2492552dc8b320e299a51241c5960c0bef67ed1f.tar.bz2 rsyslog-2492552dc8b320e299a51241c5960c0bef67ed1f.zip | |
bugfix: imzmq3 segfault with PULL subscription
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | plugins/imzmq3/imzmq3.c | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -1,6 +1,8 @@ ---------------------------------------------------------------------------- -Version 7.2.2 [v7-stable] 2012-10-30 +Version 7.2.2 [v7-stable] 2012-10-?? - bugfix: omfwd did not properly support "template" parameter +- bugfix: imzmq3 segfault with PULL subscription + Thanks to Martin Nilsson for the patch. ---------------------------------------------------------------------------- Version 7.2.1 [v7-stable] 2012-10-29 - bugfix: ruleset()-object did only support a single statement diff --git a/plugins/imzmq3/imzmq3.c b/plugins/imzmq3/imzmq3.c index dc1d64d3..52c12a53 100644 --- a/plugins/imzmq3/imzmq3.c +++ b/plugins/imzmq3/imzmq3.c @@ -375,8 +375,10 @@ static rsRetVal createSocket(socket_info* info, void** sock) { zsocket_set_rcvhwm(*sock, info->rcvHWM); /* Set subscriptions.*/ - for (ii = 0; ii < sizeof(info->subscriptions)/sizeof(char*); ++ii) - zsocket_set_subscribe(*sock, info->subscriptions[ii]); + if (info->type == ZMQ_SUB) { + for (ii = 0; ii < sizeof(info->subscriptions)/sizeof(char*); ++ii) + zsocket_set_subscribe(*sock, info->subscriptions[ii]); + } |