cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-14 14:54:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Be absolutely sure to clear pncalls before leaving event_signal_closure

Browse Source 
I thought we'd fixed the cases where this could come up, but
apparently having an event_base_break() happen while processing
signal events could get us in trouble.

Found by Remi Gacogne.  Sourceforge issue 3451433 .
This commit is contained in:
Nick Mathewson 2011-12-05 15:02:27 -05:00
parent ba4d66961e
commit 11f36a5f76
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
event.c
View File

@ -1038,6 +1038,7 @@ event_signal_closure(struct event_base *base, struct event *ev)
/* Allows deletes to work */ /* Allows deletes to work */
ncalls = ev->ev_ncalls; ncalls = ev->ev_ncalls;
if (ncalls != 0)
ev->ev_pncalls = &ncalls; ev->ev_pncalls = &ncalls;
EVBASE_RELEASE_LOCK(base, th_base_lock); EVBASE_RELEASE_LOCK(base, th_base_lock);
while (ncalls) { while (ncalls) {
@ -1051,9 +1052,12 @@ event_signal_closure(struct event_base *base, struct event *ev)
should_break = base->event_break; should_break = base->event_break;
EVBASE_RELEASE_LOCK(base, th_base_lock); EVBASE_RELEASE_LOCK(base, th_base_lock);
if (should_break) if (should_break) {
if (ncalls != 0)
ev->ev_pncalls = NULL;
return; return;
} }
}
} }
/* Common timeouts are special timeouts that are handled as queues rather than /* Common timeouts are special timeouts that are handled as queues rather than