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

Merge pull request #4314 from ThalesGroup/issue-4312-epoll-invalid-null-pointer

Browse Source 
Issue 4312 : Fix epoll invalid event data pointer
This commit is contained in:
Luca Boccassi 2021-12-03 18:31:51 +00:00 committed by GitHub
commit ab9c7add58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
RELICENSE/patrickvolante.md Normal file
View File

@ -0,0 +1,15 @@
# Permission to Relicense under MPLv2 or any other share-alike OSI approved license chosen by the current ZeroMQ BDFL
This is a statement by Patrick Volante
that grants permission to relicense its copyrights in the libzmq C++
library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
share-alike Open Source Initiative approved license chosen by the current
ZeroMQ BDFL (Benevolent Dictator for Life).
A portion of the commits made by the Github handle "patrick-volante", with
commit author "patrick-volante <patrick.volante@thalesgroup.com>", are copyright of patrick volante.
This document hereby grants the libzmq project team to relicense libzmq,
including all past, present and future contributions of the author listed above.
Patrick Volante
03/12/2021

4
src/epoll.cpp
View File

@ -192,6 +192,10 @@ void zmq::epoll_t::loop ()
const poll_entry_t *const pe = const poll_entry_t *const pe =
static_cast<const poll_entry_t *> (ev_buf[i].data.ptr); static_cast<const poll_entry_t *> (ev_buf[i].data.ptr);
if (NULL == pe)
continue;
if (NULL == pe->events)
continue;
if (pe->fd == retired_fd) if (pe->fd == retired_fd)
continue; continue;
if (ev_buf[i].events & (EPOLLERR | EPOLLHUP)) if (ev_buf[i].events & (EPOLLERR | EPOLLHUP))