1 files changed, 16 insertions, 14 deletions

diff --git a/lib/if.c b/lib/if.c
index e61bf00283..9d0f13ecbd 100644
--- a/lib/if.c
+++ b/lib/if.c
@@ -185,7 +185,7 @@ void if_destroy_via_zapi(struct interface *ifp)
 
 	if_set_index(ifp, IFINDEX_INTERNAL);
 	if (!ifp->configured)
-		if_delete(ifp);
+		if_delete(&ifp);
 }
 
 void if_up_via_zapi(struct interface *ifp)
@@ -283,27 +283,29 @@ void if_delete_retain(struct interface *ifp)
 }
 
 /* Delete and free interface structure. */
-void if_delete(struct interface *ifp)
+void if_delete(struct interface **ifp)
 {
+	struct interface *ptr = *ifp;
 	struct vrf *vrf;
 
-	vrf = vrf_lookup_by_id(ifp->vrf_id);
+	vrf = vrf_lookup_by_id(ptr->vrf_id);
 	assert(vrf);
 
-	IFNAME_RB_REMOVE(vrf, ifp);
-	if (ifp->ifindex != IFINDEX_INTERNAL)
-		IFINDEX_RB_REMOVE(vrf, ifp);
+	IFNAME_RB_REMOVE(vrf, ptr);
+	if (ptr->ifindex != IFINDEX_INTERNAL)
+		IFINDEX_RB_REMOVE(vrf, ptr);
 
-	if_delete_retain(ifp);
+	if_delete_retain(ptr);
 
-	list_delete(&ifp->connected);
-	list_delete(&ifp->nbr_connected);
+	list_delete(&ptr->connected);
+	list_delete(&ptr->nbr_connected);
 
-	if_link_params_free(ifp);
+	if_link_params_free(ptr);
 
-	XFREE(MTYPE_TMP, ifp->desc);
+	XFREE(MTYPE_TMP, ptr->desc);
 
-	XFREE(MTYPE_IF, ifp);
+	XFREE(MTYPE_IF, ptr);
+	*ifp = NULL;
 }
 
 /* Used only internally to check within VRF only */
@@ -1169,7 +1171,7 @@ void if_terminate(struct vrf *vrf)
 			ifp->node->info = NULL;
 			route_unlock_node(ifp->node);
 		}
-		if_delete(ifp);
+		if_delete(&ifp);
 	}
 }
 
@@ -1551,7 +1553,7 @@ static int lib_interface_destroy(enum nb_event event,
 		ifp = nb_running_unset_entry(dnode);
 
 		ifp->configured = false;
-		if_delete(ifp);
+		if_delete(&ifp);
 		break;
 	}