Merge branch '1210-address-potential-null-pointer-dereference-in-rpz-c' into 'master'

Resolve "Address potential NULL pointer dereference in rpz.c"

Closes #1210

See merge request isc-projects/bind9!2308
This commit is contained in:
Mark Andrews 2019-09-04 17:07:13 -04:00
commit fac49b7ba9
2 changed files with 4 additions and 1 deletions

View file

@ -1,3 +1,6 @@
5289. [bug] Address NULL pointer dereference in rpz.c:rpz_detach.
[GL #1210]
5288. [bug] dnssec-must-be-secure was not always honoured.
[GL #1209]

View file

@ -2126,7 +2126,7 @@ rpz_detach(dns_rpz_zone_t **rpzp) {
dns_db_detach(&rpz->db);
}
if (rpz->updaterunning) {
isc_task_purgeevent(rpz->rpzs->updater, &rpz->updateevent);
isc_task_purgeevent(rpzs->updater, &rpz->updateevent);
if (rpz->updbit != NULL) {
dns_dbiterator_destroy(&rpz->updbit);
}