generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-03 04:38:42 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3428 from Eelis/mallocfail

Browse Source 
Don't crash if memory allocation in socket_poller_t::rebuild fails.
This commit is contained in:
Constantin Rack 2019-02-23 10:52:22 +01:00 committed by GitHub
commit 831ac95fd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/zmq_poller.txt
View File

@ -223,6 +223,8 @@ On _zmq_poller_add_fd_, _zmq_poller_modify_fd_ and _zmq_poller_remove_fd_:
The _fd_ specified was the retired fd. The _fd_ specified was the retired fd.
On _zmq_poller_wait_ and _zmq_poller_wait_all_: On _zmq_poller_wait_ and _zmq_poller_wait_all_:
*ENOMEM*::
Necessary resources could not be allocated.
*ETERM*:: *ETERM*::
At least one of the registered objects is a 'socket' whose associated 0MQ At least one of the registered objects is a 'socket' whose associated 0MQ
'context' was terminated. 'context' was terminated.

20
src/socket_poller.cpp
View File

@ -260,7 +260,7 @@ int zmq::socket_poller_t::remove_fd (fd_t fd_)
return 0; return 0;
} }
void zmq::socket_poller_t::rebuild () int zmq::socket_poller_t::rebuild ()
{ {
_use_signaler = false; _use_signaler = false;
_pollset_size = 0; _pollset_size = 0;
@ -287,10 +287,15 @@ void zmq::socket_poller_t::rebuild ()
} }
if (_pollset_size == 0) if (_pollset_size == 0)
return; return 0;
_pollfds = static_cast<pollfd *> (malloc (_pollset_size * sizeof (pollfd))); _pollfds = static_cast<pollfd *> (malloc (_pollset_size * sizeof (pollfd)));
alloc_assert (_pollfds);
if (!_pollfds) {
errno = ENOMEM;
_need_rebuild = true;
return -1;
}
int item_nbr = 0; int item_nbr = 0;
@ -390,6 +395,8 @@ void zmq::socket_poller_t::rebuild ()
} }
#endif #endif
return 0;
} }
void zmq::socket_poller_t::zero_trail_events ( void zmq::socket_poller_t::zero_trail_events (
@ -523,8 +530,11 @@ int zmq::socket_poller_t::wait (zmq::socket_poller_t::event_t *events_,
return -1; return -1;
} }
if (_need_rebuild) if (_need_rebuild) {
rebuild (); int rc = rebuild ();
if (rc == -1)
return -1;
}
if (unlikely (_pollset_size == 0)) { if (unlikely (_pollset_size == 0)) {
// We'll report an error (timed out) as if the list was non-empty and // We'll report an error (timed out) as if the list was non-empty and

2
src/socket_poller.hpp
View File

@ -101,7 +101,7 @@ class socket_poller_t
uint64_t &now_, uint64_t &now_,
uint64_t &end_, uint64_t &end_,
bool &first_pass_); bool &first_pass_);
void rebuild (); int rebuild ();
// Used to check whether the object is a socket_poller. // Used to check whether the object is a socket_poller.
uint32_t _tag; uint32_t _tag;