Mercurial > hg > nginx
changeset 5016:4406168861e8
Events: fixed null pointer dereference with resolver and poll.
A POLLERR signalled by poll() without POLLIN/POLLOUT, as seen on
Linux, would generate both read and write events, but there's no
write event handler for resolver events. A fix is to only call
event handler of an active event.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Fri, 25 Jan 2013 09:59:28 +0000 |
parents | a74d211f034d |
children | d89442dab4d1 |
files | src/event/modules/ngx_poll_module.c |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/event/modules/ngx_poll_module.c Thu Jan 24 16:15:51 2013 +0000 +++ b/src/event/modules/ngx_poll_module.c Fri Jan 25 09:59:28 2013 +0000 @@ -371,7 +371,7 @@ found = 0; - if (revents & POLLIN) { + if ((revents & POLLIN) && c->read->active) { found = 1; ev = c->read; @@ -388,7 +388,7 @@ ngx_locked_post_event(ev, queue); } - if (revents & POLLOUT) { + if ((revents & POLLOUT) && c->write->active) { found = 1; ev = c->write;