Merge pull request #3878 from Eelis/master

Problem: out-of-bounds array access in socket_poller::check_events.
This commit is contained in:
Luca Boccassi 2020-04-20 12:50:41 +01:00 committed by GitHub
commit a525323757
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -443,9 +443,9 @@ int zmq::socket_poller_t::check_events (zmq::socket_poller_t::event_t *events_,
}
// Else, the poll item is a raw file descriptor, simply convert
// the events to zmq_pollitem_t-style format.
else {
else if (it->events) {
#if defined ZMQ_POLL_BASED_ON_POLL
zmq_assert (it->pollfd_index >= 0);
const short revents = _pollfds[it->pollfd_index].revents;
short events = 0;