From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 10 Oct 2017 17:33:14 +0000 (-0400)
Subject: ospfd: Fix ships in the night PR's and list_delete
X-Git-Tag: frr-4.0-dev~217^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=84519c816445c7105d4a70f43b92b3ee5ab3802d;p=matthieu%2Ffrr.git

ospfd: Fix ships in the night PR's and list_delete

list_delete_and_null should be used.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index 069ba96be6..0a9a53dbb2 100644
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -634,7 +634,7 @@ static void ospf_finish_final(struct ospf *ospf)
 	/* Reset interface. */
 	for (ALL_LIST_ELEMENTS(ospf->oiflist, node, nnode, oi))
 		ospf_if_free(oi);
-	list_delete(ospf->oiflist);
+	list_delete_and_null(&ospf->oiflist);
 
 	/* De-Register VRF */
 	ospf_zebra_vrf_deregister(ospf);
@@ -769,7 +769,7 @@ static void ospf_finish_final(struct ospf *ospf)
 	if (!CHECK_FLAG(om->options, OSPF_MASTER_SHUTDOWN))
 		instance = ospf->instance;
 
-	list_delete(ospf->oi_write_q);
+	list_delete_and_null(&ospf->oi_write_q);
 
 	ospf_delete(ospf);