From 2492552dc8b320e299a51241c5960c0bef67ed1f Mon Sep 17 00:00:00 2001 From: Martin Nilsson Date: Tue, 30 Oct 2012 16:30:18 +0100 Subject: bugfix: imzmq3 segfault with PULL subscription --- ChangeLog | 4 +++- plugins/imzmq3/imzmq3.c | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d1b0d8ef..2be32c0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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]); + } -- cgit v1.2.3