From 9d8e8a4fcc70577db8bf1350310f5014398f131d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
Date: Sun, 6 Mar 2022 10:16:29 +0100
Subject: [PATCH] Fix null pointer dereferences in udp_ready()

The query pointer was detached too early leading to null pointer
reference.  Move the query_detach() after the query->canceled check.
---
 bin/dig/dighost.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index faad62c13c..c736a3357a 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -2900,10 +2900,10 @@ udp_ready(isc_nmhandle_t *handle, isc_result_t eresult, void *arg) {
 		dig_lookup_t *l = query->lookup;
 
 		debug("in cancel handler");
-		query_detach(&query);
 		if (!query->canceled) {
 			cancel_lookup(l);
 		}
+		query_detach(&query);
 		lookup_detach(&l);
 		return;
 	} else if (eresult != ISC_R_SUCCESS) {