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

restore signal handlers correctly when we deallocate the signal base

Browse Source 
svn:r913
This commit is contained in:
Niels Provos 2008-07-19 23:35:29 +00:00
parent 5e905c9dd5
commit 1c164cebb8
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
signal.c
View File

@ -145,14 +145,19 @@ _evsignal_set_handler(struct event_base *base,
* a dynamic array is used to keep footprint on the low side. * a dynamic array is used to keep footprint on the low side.
*/ */
if (evsignal >= sig->sh_old_max) { if (evsignal >= sig->sh_old_max) {
int new_max = evsignal + 1;
event_debug(("%s: evsignal (%d) >= sh_old_max (%d), resizing", event_debug(("%s: evsignal (%d) >= sh_old_max (%d), resizing",
__func__, evsignal, sig->sh_old_max)); __func__, evsignal, sig->sh_old_max));
sig->sh_old_max = evsignal + 1; p = mm_realloc(sig->sh_old, new_max * sizeof(*sig->sh_old));
p = mm_realloc(sig->sh_old, sig->sh_old_max * sizeof *sig->sh_old);
if (p == NULL) { if (p == NULL) {
event_warn("realloc"); event_warn("realloc");
return (-1); return (-1);
} }
memset((char *)p + sig->sh_old_max * sizeof(*sig->sh_old),
0, (new_max - sig->sh_old_max) * sizeof(*sig->sh_old));
sig->sh_old_max = new_max;
sig->sh_old = p; sig->sh_old = p;
} }
@ -327,8 +332,11 @@ evsignal_dealloc(struct event_base *base)
event_del(&base->sig.ev_signal); event_del(&base->sig.ev_signal);
base->sig.ev_signal_added = 0; base->sig.ev_signal_added = 0;
} }
for (i = 0; i < NSIG; ++i) for (i = 0; i < NSIG; ++i) {
if (i < base->sig.sh_old_max && base->sig.sh_old[i] != NULL)
_evsignal_restore_handler(base, i);
assert(TAILQ_EMPTY(&base->sig.evsigevents[0])); assert(TAILQ_EMPTY(&base->sig.evsigevents[0]));
}
EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[0]); EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[0]);
base->sig.ev_signal_pair[0] = -1; base->sig.ev_signal_pair[0] = -1;