generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-24 09:12:30 +02:00
Code Issues Projects Releases Wiki Activity

Fix a bug reported on the mailing list.

Browse Source 
Both memcmp and strcmp return zero on equal, nonzero on nonequal;
so all of these tests were backwards.

The original committer fixed the failure by comparing 22 bytes instead
of the correct 21, so that the assertions would trigger only if the
22nd byte happened to match exactly --- which was rare.

The correct fix is to compare the right number of bytes with the
right sense.  (I think all of the ".addr" fields are null-terminated,
in which case it's more appropriate to use strcmp throughout.)
This commit is contained in:
Arthur O'Dwyer
2012-08-23 12:56:00 -07:00
parent 12833804c9
commit f718d2bead
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/test_monitor.cpp
View File

@@ -36,39 +36,39 @@ void socket_monitor (void *s, int event_, zmq_event_data_t *data_)
// listener specific // listener specific
case ZMQ_EVENT_LISTENING: case ZMQ_EVENT_LISTENING:
assert (data_->listening.fd > 0); assert (data_->listening.fd > 0);
assert (memcmp (data_->listening.addr, addr, 22)); assert (!strcmp (data_->listening.addr, addr));
events |= ZMQ_EVENT_LISTENING; events |= ZMQ_EVENT_LISTENING;
break; break;
case ZMQ_EVENT_ACCEPTED: case ZMQ_EVENT_ACCEPTED:
assert (data_->accepted.fd > 0); assert (data_->accepted.fd > 0);
assert (memcmp (data_->accepted.addr, addr, 22)); assert (!strcmp (data_->accepted.addr, addr));
events |= ZMQ_EVENT_ACCEPTED; events |= ZMQ_EVENT_ACCEPTED;
break; break;
// connecter specific // connecter specific
case ZMQ_EVENT_CONNECTED: case ZMQ_EVENT_CONNECTED:
assert (data_->connected.fd > 0); assert (data_->connected.fd > 0);
assert (memcmp (data_->connected.addr, addr, 22)); assert (!strcmp (data_->connected.addr, addr));
events |= ZMQ_EVENT_CONNECTED; events |= ZMQ_EVENT_CONNECTED;
break; break;
case ZMQ_EVENT_CONNECT_DELAYED: case ZMQ_EVENT_CONNECT_DELAYED:
assert (data_->connect_delayed.err != 0); assert (data_->connect_delayed.err != 0);
assert (memcmp (data_->connect_delayed.addr, addr, 22)); assert (!strcmp (data_->connect_delayed.addr, addr));
events |= ZMQ_EVENT_CONNECT_DELAYED; events |= ZMQ_EVENT_CONNECT_DELAYED;
break; break;
// generic - either end of the socket // generic - either end of the socket
case ZMQ_EVENT_CLOSE_FAILED: case ZMQ_EVENT_CLOSE_FAILED:
assert (data_->close_failed.err != 0); assert (data_->close_failed.err != 0);
assert (memcmp (data_->close_failed.addr, addr, 22)); assert (!strcmp (data_->close_failed.addr, addr));
events |= ZMQ_EVENT_CLOSE_FAILED; events |= ZMQ_EVENT_CLOSE_FAILED;
break; break;
case ZMQ_EVENT_CLOSED: case ZMQ_EVENT_CLOSED:
assert (data_->closed.fd != 0); assert (data_->closed.fd != 0);
assert (memcmp (data_->closed.addr, addr, 22)); assert (!strcmp (data_->closed.addr, addr));
events |= ZMQ_EVENT_CLOSED; events |= ZMQ_EVENT_CLOSED;
break; break;
case ZMQ_EVENT_DISCONNECTED: case ZMQ_EVENT_DISCONNECTED:
assert (data_->disconnected.fd != 0); assert (data_->disconnected.fd != 0);
assert (memcmp (data_->disconnected.addr, addr, 22)); assert (!strcmp (data_->disconnected.addr, addr));
events |= ZMQ_EVENT_DISCONNECTED; events |= ZMQ_EVENT_DISCONNECTED;
break; break;
default: default: