mirror of
https://github.com/isc-projects/bind9.git
synced 2026-03-15 07:02:40 -04:00
Fix a shutdown bug in update_rpz_cb()
When shutting down, the cleanup path should not try to destroy
'newnodes', because it is NULL at that point.
Introduce another label for the "shuttingdown" scenario.
(cherry picked from commit 975d16230b)
This commit is contained in:
parent
c8206cab0b
commit
cc4cb67149
1 changed files with 2 additions and 1 deletions
|
|
@ -1918,7 +1918,7 @@ update_rpz_cb(void *data) {
|
|||
|
||||
result = dns__rpz_shuttingdown(rpz->rpzs);
|
||||
if (result != ISC_R_SUCCESS) {
|
||||
goto cleanup;
|
||||
goto shuttingdown;
|
||||
}
|
||||
|
||||
isc_ht_init(&newnodes, rpz->rpzs->mctx, 1, ISC_HT_CASE_SENSITIVE);
|
||||
|
|
@ -1939,6 +1939,7 @@ update_rpz_cb(void *data) {
|
|||
cleanup:
|
||||
isc_ht_destroy(&newnodes);
|
||||
|
||||
shuttingdown:
|
||||
rpz->updateresult = result;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue