lib: enforce vrf_name_to_id by returning default_vrf when name is null

[mirror_frr.git] / ospfd / ospf_route.c

diff --git a/ospfd/ospf_route.c b/ospfd/ospf_route.c
index b964bbab74092763cab8639056c71eb04459f775..7ee91b5b6c9655427fea257512e7fc6f53018c43 100644 (file)
--- a/ospfd/ospf_route.c
+++ b/ospfd/ospf_route.c
@@ -54,7 +54,7 @@ struct ospf_route *ospf_route_new()
 void ospf_route_free(struct ospf_route * or)
 {
        if (or->paths)
-               list_delete_and_null(& or->paths);
+               list_delete(& or->paths);
 
        XFREE(MTYPE_OSPF_ROUTE, or);
 }
@@ -170,8 +170,8 @@ int ospf_route_match_same(struct route_table *rt, struct prefix_ipv4 *prefix,
                        /* Check each path. */
                        for (n1 = listhead(or->paths),
                            n2 = listhead(newor->paths);
-                            n1 && n2;
-                            n1 = listnextnode(n1), n2 = listnextnode(n2)) {
+                            n1 && n2; n1 = listnextnode_unchecked(n1),
+                           n2 = listnextnode_unchecked(n2)) {
                                op = listgetdata(n1);
                                newop = listgetdata(n2);
 
@@ -905,7 +905,7 @@ void ospf_prune_unreachable_routers(struct route_table *rtrs)
                                zlog_debug("Pruning router node %s",
                                           inet_ntoa(rn->p.u.prefix4));
 
-                       list_delete_and_null(&paths);
+                       list_delete(&paths);
                        rn->info = NULL;
                        route_unlock_node(rn);
                }