From: Mark Andrews <marka@isc.org>
Date: Tue, 28 Sep 2021 00:12:31 +0000 (+1000)
Subject: Address use before NULL check warning of ievent->sock
X-Git-Tag: v9.17.19~24^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8fc9bb8e8ea357383e999d449f6d606811856e38;p=thirdparty%2Fbind9.git

Address use before NULL check warning of ievent->sock

Reorder REQUIRE checks to ensure ievent->sock is checked earlier
---

diff --git a/lib/isc/netmgr/tcpdns.c b/lib/isc/netmgr/tcpdns.c
index 11a7111b3ae..b5d2d248ce5 100644
--- a/lib/isc/netmgr/tcpdns.c
+++ b/lib/isc/netmgr/tcpdns.c
@@ -1110,10 +1110,9 @@ isc__nm_async_tcpdnssend(isc__networker_t *worker, isc__netievent_t *ev0) {
 	isc__netievent_tcpdnssend_t *ievent =
 		(isc__netievent_tcpdnssend_t *)ev0;
 
-	REQUIRE(ievent->sock->type == isc_nm_tcpdnssocket);
-	REQUIRE(ievent->sock->tid == isc_nm_tid());
-	REQUIRE(VALID_NMSOCK(ievent->sock));
 	REQUIRE(VALID_UVREQ(ievent->req));
+	REQUIRE(VALID_NMSOCK(ievent->sock));
+	REQUIRE(ievent->sock->type == isc_nm_tcpdnssocket);
 	REQUIRE(ievent->sock->tid == isc_nm_tid());
 
 	isc_result_t result;