Merge branch '4719-prevent-passing-null-to-dns_dispatch_resume' into 'bind-9.18'

Prevent passing NULL to dns_dispatch_resume()

See merge request isc-projects/bind9!9035

CHANGES

@@ -1,3 +1,7 @@
+6388.	[bug]		Prevent an assertion failure caused by passing NULL to
+			dns_dispatch_resume() when a dns_request times out close
+			to view shutdown. [GL #4719]
+
 6386.	[bug]		When shutting down catzs->view could point to freed
 			memory. Obtain a reference to the view to prevent this.
 			[GL #4502]

doc/notes/notes-current.rst

@@ -38,6 +38,11 @@ Bug Fixes
 - An RPZ response's SOA record TTL was set to 1 instead of the SOA TTL, if
   ``add-soa`` was used. This has been fixed. :gl:`#3323`
 
+- When a query related to zone maintenance (NOTIFY, SOA) timed out close
+  to a view shutdown (triggered e.g. by :option:`rndc reload`),
+  :iscman:`named` could crash with an assertion failure. This has been
+  fixed. :gl:`#4719`
+
 Known Issues
 ~~~~~~~~~~~~
 

lib/dns/request.c

@@ -1061,7 +1061,7 @@ req_response(isc_result_t result, isc_region_t *region, void *arg) {
 
 	if (result == ISC_R_TIMEDOUT) {
 		LOCK(&request->requestmgr->locks[request->hash]);
-		if (request->udpcount > 1 &&
+		if (!DNS_REQUEST_CANCELED(request) && request->udpcount > 1 &&
 		    (request->flags & DNS_REQUEST_F_TCP) == 0)
 		{
 			request->udpcount -= 1;