3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-17 08:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Problem: assertion triggered in stream_connecter_base::close

Browse Source 
Solution: change into regular control flow condition
This commit is contained in:
Simon Giesecke 2019-02-11 11:23:48 -05:00
parent 2759f459df
commit 7fbd977184
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/stream_connecter_base.cpp
View File

@ -130,7 +130,8 @@ void zmq::stream_connecter_base_t::rm_handle ()
void zmq::stream_connecter_base_t::close () void zmq::stream_connecter_base_t::close ()
{ {
zmq_assert (_s != retired_fd); // TODO before, this was an assertion for _s != retired_fd, but this does not match usage of close
if (_s != retired_fd) {
#ifdef ZMQ_HAVE_WINDOWS #ifdef ZMQ_HAVE_WINDOWS
const int rc = closesocket (_s); const int rc = closesocket (_s);
wsa_assert (rc != SOCKET_ERROR); wsa_assert (rc != SOCKET_ERROR);
@ -138,10 +139,11 @@ void zmq::stream_connecter_base_t::close ()
const int rc = ::close (_s); const int rc = ::close (_s);
errno_assert (rc == 0); errno_assert (rc == 0);
#endif #endif
_socket->event_closed (make_unconnected_connect_endpoint_pair (_endpoint), _socket->event_closed (
_s); make_unconnected_connect_endpoint_pair (_endpoint), _s);
_s = retired_fd; _s = retired_fd;
} }
}
void zmq::stream_connecter_base_t::in_event () void zmq::stream_connecter_base_t::in_event ()
{ {