Unverified Commit a5253237 authored by Luca Boccassi's avatar Luca Boccassi Committed by GitHub

Merge pull request #3878 from Eelis/master

Problem: out-of-bounds array access in socket_poller::check_events.
parents f00f4645 063f14a9
...@@ -443,9 +443,9 @@ int zmq::socket_poller_t::check_events (zmq::socket_poller_t::event_t *events_, ...@@ -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 // Else, the poll item is a raw file descriptor, simply convert
// the events to zmq_pollitem_t-style format. // the events to zmq_pollitem_t-style format.
else { else if (it->events) {
#if defined ZMQ_POLL_BASED_ON_POLL #if defined ZMQ_POLL_BASED_ON_POLL
zmq_assert (it->pollfd_index >= 0);
const short revents = _pollfds[it->pollfd_index].revents; const short revents = _pollfds[it->pollfd_index].revents;
short events = 0; short events = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment