upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-08 20:42:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '556-race-condition-in-timer-creation' into 'master'

Browse source 
Fix crash caused by race condition in timer creation

Closes #556

See merge request isc-projects/bind9!801
This commit is contained in:
Evan Hunt 2018-09-27 15:59:30 -04:00
commit 261b7560b0
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/isc/timer.c
View file

@ -398,8 +398,10 @@ isc__timer_create(isc_timermgr_t *manager0, isc_timertype_t type,
result = schedule(timer, &now, true);
else
result = ISC_R_SUCCESS;
if (result == ISC_R_SUCCESS)
if (result == ISC_R_SUCCESS) {
*timerp = (isc_timer_t *)timer;
APPEND(manager->timers, timer, link);
}
UNLOCK(&manager->lock);
@ -412,8 +414,6 @@ isc__timer_create(isc_timermgr_t *manager0, isc_timertype_t type,
return (result);
}
*timerp = (isc_timer_t *)timer;
return (ISC_R_SUCCESS);
}