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

bug fix and potentital race condition from Alexander Drozdov

Browse Source 
svn:r1025
This commit is contained in:
Niels Provos 2009-01-19 23:40:11 +00:00
parent f6eb1f816c
commit ed7e0e77ed
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
event.c
View File

@ -390,8 +390,13 @@ event_reinit(struct event_base *base)
/* prevent internal delete */ /* prevent internal delete */
if (base->sig.ev_signal_added) { if (base->sig.ev_signal_added) {
/* we cannot call event_del here because the base has
* not been reinitialized yet. */
event_queue_remove(base, &base->sig.ev_signal, event_queue_remove(base, &base->sig.ev_signal,
EVLIST_INSERTED); EVLIST_INSERTED);
if (base->sig.ev_signal.ev_flags & EVLIST_ACTIVE)
event_queue_remove(base, &base->sig.ev_signal,
EVLIST_ACTIVE);
base->sig.ev_signal_added = 0; base->sig.ev_signal_added = 0;
} }

2
signal.c
View File

@ -311,9 +311,9 @@ evsig_process(struct event_base *base)
ncalls = sig->evsigcaught[i]; ncalls = sig->evsigcaught[i];
if (ncalls == 0) if (ncalls == 0)
continue; continue;
sig->evsigcaught[i] -= ncalls;
evmap_signal_active(base, i, ncalls); evmap_signal_active(base, i, ncalls);
sig->evsigcaught[i] = 0;
} }
} }