From: Mark Andrews <marka@isc.org>
Date: Mon, 4 Sep 2023 23:46:05 +0000 (+1000)
Subject: Restore dns_validator_destroy and fetchctx_detach call order
X-Git-Tag: v9.19.17~9^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf63cb1136449625fe3279924fde215f6498ccfd;p=thirdparty%2Fbind9.git

Restore dns_validator_destroy and fetchctx_detach call order

7a78a85b moved the destruction of the validator from near the start
validated to the end.  This reversed the order of dns_validator_destroy
and fetchctx_detach.  Restore the order so that val->name remains
valid for the lifetime of the validator.
---

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index fb1e401e780..d017c2b3b03 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -5622,9 +5622,14 @@ cleanup_fetchctx:
 		fctx_done_unref(fctx, result);
 	}
 
+	/*
+	 * val->name points to name on a message on one of the
+	 * queries on the fetch context so the validator has to
+	 * be destroyed first.
+	 */
+	dns_validator_destroy(&val);
 	fetchctx_detach(&fctx);
 	INSIST(node == NULL);
-	dns_validator_destroy(&val);
 }
 
 static void