upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '3571-fix-data-race-in-dns_nta' into 'main'

Browse source 
Don't stop timer from dns__nta_shutdown()

Closes #3571

See merge request isc-projects/bind9!6844
This commit is contained in:
Ondřej Surý 2022-09-30 14:18:29 +00:00
commit 3b01b436a2
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/dns/nta.c
View file

@ -645,7 +645,7 @@ dns__nta_shutdown_cb(dns__nta_t *nta) {
REQUIRE(VALID_NTA(nta));
if (nta->timer) {
isc_timer_stop(nta->timer); /* This is superfluous */
isc_timer_stop(nta->timer);
isc_timer_destroy(&nta->timer);
}
@ -656,10 +656,6 @@ static void
dns__nta_shutdown(dns__nta_t *nta) {
REQUIRE(VALID_NTA(nta));
if (nta->timer != NULL) {
isc_timer_stop(nta->timer);
}
dns__nta_ref(nta);
isc_async_run(nta->loop, (isc_job_cb)dns__nta_shutdown_cb, nta);
}