From 3e82a2ea9a5f7cd3c24b7c0ba9e0bc8a5149ef65 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 5 Sep 2019 00:28:07 +1000 Subject: [PATCH 1/2] use rpzs->updater as rpz->rpzs is NULL --- lib/dns/rpz.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c index 45cf34217a..d4d5766c78 100644 --- a/lib/dns/rpz.c +++ b/lib/dns/rpz.c @@ -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); } From 924f9b9e1d01c025a759253b1b6b69c070228a15 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 5 Sep 2019 00:30:12 +1000 Subject: [PATCH 2/2] add CHANGES --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index df7932c032..332b0362fc 100644 --- a/CHANGES +++ b/CHANGES @@ -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]