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

Address use before NULL check warning of uvreq

move dereference of uvreq until the after NULL check.
---

diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
index a74047d763d..6f10061fcd9 100644
--- a/lib/isc/netmgr/netmgr.c
+++ b/lib/isc/netmgr/netmgr.c
@@ -2730,8 +2730,7 @@ isc__nm_async_readcb(isc__networker_t *worker, isc__netievent_t *ev0) {
 	isc_nmsocket_t *sock = ievent->sock;
 	isc__nm_uvreq_t *uvreq = ievent->req;
 	isc_result_t eresult = ievent->result;
-	isc_region_t region = { .base = (unsigned char *)uvreq->uvbuf.base,
-				.length = uvreq->uvbuf.len };
+	isc_region_t region;
 
 	UNUSED(worker);
 
@@ -2740,6 +2739,9 @@ isc__nm_async_readcb(isc__networker_t *worker, isc__netievent_t *ev0) {
 	REQUIRE(VALID_NMHANDLE(uvreq->handle));
 	REQUIRE(sock->tid == isc_nm_tid());
 
+	region.base = (unsigned char *)uvreq->uvbuf.base;
+	region.length = uvreq->uvbuf.len;
+
 	uvreq->cb.recv(uvreq->handle, eresult, &region, uvreq->cbarg);
 
 	isc__nm_uvreq_put(&uvreq, sock);