Merge pull request #5430 from taruta811/build-docker-centos

[mirror_frr.git] / pimd / pim_neighbor.c

diff --git a/pimd/pim_neighbor.c b/pimd/pim_neighbor.c
index a63b09fc1f9a05b4119bb85eefda954224788010..3f2aaf2bbed0ee210d8a94a8eca1859fdc5ef8ca 100644 (file)
--- a/pimd/pim_neighbor.c
+++ b/pimd/pim_neighbor.c
@@ -424,10 +424,11 @@ struct pim_neighbor *pim_neighbor_find_by_secondary(struct interface *ifp,
        struct pim_neighbor *neigh;
        struct prefix *p;
 
-       pim_ifp = ifp->info;
-       if (!pim_ifp)
+       if (!ifp || !ifp->info)
                return NULL;
 
+       pim_ifp = ifp->info;
+
        for (ALL_LIST_ELEMENTS_RO(pim_ifp->pim_neighbor_list, node, neigh)) {
                for (ALL_LIST_ELEMENTS_RO(neigh->prefix_list, pnode, p)) {
                        if (prefix_same(p, src))
@@ -766,7 +767,7 @@ static void delete_from_neigh_addr(struct interface *ifp,
                                                other_neigh_str, ifp->name);
 
                                        listnode_delete(neigh->prefix_list, p);
-                                       prefix_free(p);
+                                       prefix_free(&p);
                                }
                        }