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 <[email protected]>
scotty-labs · Dec 15, 2011 · a9e0333 · a9e0333
1 parent e7d748e
commit a9e0333
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/ipc_connecter.cpp b/src/ipc_connecter.cpp
@@ -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();
 }

diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp
@@ -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();
 }