Merge pull request #1881 from camachat/master

Fixes #1419 segfault when using a XSUB/XPUB proxy.
This commit is contained in:
Constantin Rack 2016-04-02 18:30:09 +02:00
commit 0feec7a72e

View File

@ -124,12 +124,14 @@ void zmq::dist_t::pipe_terminated (pipe_t *pipe_)
void zmq::dist_t::activated (pipe_t *pipe_)
{
// Move the pipe from passive to eligible state.
if (eligible < pipes.size ()) {
pipes.swap (pipes.index (pipe_), eligible);
eligible++;
}
// If there's no message being sent at the moment, move it to
// the active state.
if (!more) {
if (!more && active < pipes.size ()) {
pipes.swap (eligible - 1, active);
active++;
}