From: Ondřej Surý <ondrej@sury.org>
Date: Fri, 27 Sep 2019 10:12:14 +0000 (+0200)
Subject: lib/ns/query.c: Fix invalid order of DbC checks that could cause dereference before... 
X-Git-Tag: v9.15.6~72^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1f035bbba57df40407a8c1dfbebc15cf42eccf3;p=thirdparty%2Fbind9.git

lib/ns/query.c: Fix invalid order of DbC checks that could cause dereference before NULL check
---

diff --git a/lib/ns/query.c b/lib/ns/query.c
index 10e7af37f96..4e43b1d92c9 100644
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -10930,15 +10930,19 @@ log_queryerror(ns_client_t *client, isc_result_t result, int line, int level) {
 void
 ns_query_start(ns_client_t *client) {
 	isc_result_t result;
-	dns_message_t *message = client->message;
+	dns_message_t *message;
 	dns_rdataset_t *rdataset;
 	ns_client_t *qclient;
 	dns_rdatatype_t qtype;
-	unsigned int saved_extflags = client->extflags;
-	unsigned int saved_flags = client->message->flags;
+	unsigned int saved_extflags;
+	unsigned int saved_flags;
 
 	REQUIRE(NS_CLIENT_VALID(client));
 
+	message = client->message;
+	saved_extflags = client->extflags;
+	saved_flags = client->message->flags;
+
 	CTRACE(ISC_LOG_DEBUG(3), "ns_query_start");
 
 	/*