A synchronous connect() failure in ipc_connecter can result in Assertion

failed: s == retired_fd (ipc_connecter.cpp:174), as reported in LIBZMQ-294.

This patch fixes the bug, and also an identical problem in tcp_connecter
which has not hit people since TCP connect() usually completes via the
asynchronous code path (poll, out_event).

Signed-off-by: Martin Lucina <martin@lucina.net>
This commit is contained in:
Martin Lucina 2011-12-15 13:23:40 +01:00 committed by Martin Sustrik
parent e7d748e812
commit a9e03336b0
2 changed files with 2 additions and 0 deletions

View File

@ -135,6 +135,7 @@ void zmq::ipc_connecter_t::start_connecting ()
}
// Handle any other error condition by eventual reconnect.
close ();
wait = true;
add_reconnect_timer();
}

View File

@ -146,6 +146,7 @@ void zmq::tcp_connecter_t::start_connecting ()
}
// Handle any other error condition by eventual reconnect.
close ();
wait = true;
add_reconnect_timer();
}