From 033f3eb58046f2f1f97d434bc3e7bdc6f2c15125 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ond=C5=99ej=20Sur=C3=BD?= 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 --- 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 923c057cee1..a473d50eea9 100644 --- a/lib/ns/interfacemgr.c +++ b/lib/ns/interfacemgr.c @@ -623,11 +623,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++) -- 2.47.3