mirror of
https://github.com/zeromq/libzmq.git
synced 2025-02-07 14:30:15 +01:00
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:
parent
e7d748e812
commit
a9e03336b0
@ -135,6 +135,7 @@ void zmq::ipc_connecter_t::start_connecting ()
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Handle any other error condition by eventual reconnect.
|
// Handle any other error condition by eventual reconnect.
|
||||||
|
close ();
|
||||||
wait = true;
|
wait = true;
|
||||||
add_reconnect_timer();
|
add_reconnect_timer();
|
||||||
}
|
}
|
||||||
|
@ -146,6 +146,7 @@ void zmq::tcp_connecter_t::start_connecting ()
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Handle any other error condition by eventual reconnect.
|
// Handle any other error condition by eventual reconnect.
|
||||||
|
close ();
|
||||||
wait = true;
|
wait = true;
|
||||||
add_reconnect_timer();
|
add_reconnect_timer();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user