Move isc_mem_put to after node is checked for equality

isc_mem_put NULL's the pointer to the memory being freed.  The
equality test 'parent->r == node' was accidentally being turned
into a test against NULL.

(cherry picked from commit ac2e0bc3ff375807638cfd508f417a80290a37e8)

diff --git a/lib/isc/radix.c b/lib/isc/radix.c
index d84e5d03020291cc57a715b334299326710745a5..54c03832f1f670f1a908b0d33c3a2f879760890a 100644 (file)
--- a/lib/isc/radix.c
+++ b/lib/isc/radix.c
@@ -694,13 +694,13 @@ isc_radix_remove(isc_radix_tree_t *radix, isc_radix_node_t *node) {
                return;
        }
 
-       isc_mem_put(radix->mctx, node, sizeof(*node));
-       radix->num_active_node--;
-
        if (parent->r == node) {
                parent->r = child;
        } else {
                INSIST(parent->l == node);
                parent->l = child;
        }
+
+       isc_mem_put(radix->mctx, node, sizeof(*node));
+       radix->num_active_node--;
 }