generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-16 18:56:55 +02:00
Code Issues Projects Releases Wiki Activity

Problem: waiting on an empty poller with infinite timeout waits forever

Browse Source 
Solution: return EFAULT when such an operation is attempted
This commit is contained in:
sigiesec
2017-08-22 18:36:11 +02:00
parent 0c9b16d62a
commit c1a4cfdd9f
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/socket_poller.cpp
View File

@@ -400,6 +400,11 @@ int zmq::socket_poller_t::rebuild ()
int zmq::socket_poller_t::wait (zmq::socket_poller_t::event_t *events_, int n_events_, long timeout_)
{
if (items.empty () && timeout_ < 0) {
errno = EFAULT;
return -1;
}
if (need_rebuild)
if (rebuild () == -1)
return -1;

12
tests/test_poller.cpp
View File

@@ -180,20 +180,16 @@ void test_wait_corner_cases (void *ctx)
int rc = zmq_poller_wait(poller, &event, 0);
assert (rc == -1 && errno == ETIMEDOUT);
// TODO this can never return, and should yield an error
#if 0
// this can never return since no socket was registered, and should yield an error
rc = zmq_poller_wait(poller, &event, -1);
assert (rc == 0);
#endif
assert (rc == -1 && errno == EFAULT);
rc = zmq_poller_wait_all (poller, &event, 0, 0);
assert (rc == -1 && errno == ETIMEDOUT);
// TODO this can never return, and should yield an error
#if 0
// this can never return since no socket was registered, and should yield an error
rc = zmq_poller_wait_all (poller, &event, 0, -1);
assert (rc == 0);
#endif
assert (rc == -1 && errno == EFAULT);
rc = zmq_poller_destroy (&poller);
assert (rc == 0);