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 069ba96be616b6515e2cfe21f5d1a3bc45177d51..0a9a53dbb235bbff5e76f73b08fa7e57670c884d 100644 (file)
--- 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);