]> git.puffer.fish Git - matthieu/frr.git/commitdiff
pimd: Fix crash on shutdown in oil
authorDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 3 Aug 2018 00:27:53 +0000 (20:27 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 3 Aug 2018 00:27:53 +0000 (20:27 -0400)
When shutting down, do not free oil information after
interface information since we use the data there to
do so.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
pimd/pim_instance.c

index 5121dc94ca278c6dd885ca2a9f9c60ad40e11df7..e664bf3062b9e83ca3030a5c64c4eefb35d9dddc 100644 (file)
@@ -54,10 +54,10 @@ static void pim_instance_terminate(struct pim_instance *pim)
                pim->rpf_hash = NULL;
        }
 
-       pim_oil_terminate(pim);
-
        pim_if_terminate(pim);
 
+       pim_oil_terminate(pim);
+
        pim_msdp_exit(pim);
 
        XFREE(MTYPE_PIM_PIM_INSTANCE, pim);