mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-31 06:25:31 +00:00
Merge branch '3571-fix-data-race-in-dns_nta' into 'main'
Don't stop timer from dns__nta_shutdown() Closes #3571 See merge request isc-projects/bind9!6844
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user