From 82d3faa274f80d5aa7d45ea7d269bf4fb401767b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Fri, 27 Sep 2019 12:11:16 +0200
Subject: [PATCH] lib/ns/interfacemgr.c: Fix invalid order of DbC checks that
 could cause dereference before NULL check

(cherry picked from commit 033f3eb58046f2f1f97d434bc3e7bdc6f2c15125)
---
 lib/ns/interfacemgr.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/ns/interfacemgr.c b/lib/ns/interfacemgr.c
index c17010c789..37e58ae25c 100644
--- a/lib/ns/interfacemgr.c
+++ b/lib/ns/interfacemgr.c
@@ -638,11 +638,13 @@ ns_interface_shutdown(ns_interface_t *ifp) {
 
 static void
 ns_interface_destroy(ns_interface_t *ifp) {
-	isc_mem_t *mctx = ifp->mgr->mctx;
+	isc_mem_t *mctx;
 	int disp;
 
 	REQUIRE(NS_INTERFACE_VALID(ifp));
 
+	mctx = ifp->mgr->mctx;
+
 	ns_interface_shutdown(ifp);
 
 	for (disp = 0; disp < ifp->nudpdispatch; disp++)