From 5dff412a0804e1b9357e40a42f347aba6ad65aa9 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 28 Sep 2021 10:12:31 +1000 Subject: [PATCH] Address use before NULL check warning of ievent->sock Reorder REQUIRE checks to ensure ievent->sock is checked earlier (cherry picked from commit 8fc9bb8e8ea357383e999d449f6d606811856e38) --- lib/isc/netmgr/tcpdns.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/isc/netmgr/tcpdns.c b/lib/isc/netmgr/tcpdns.c index c5843b328e..188790c8b4 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;