zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / lib / nexthop_group.c

diff --git a/lib/nexthop_group.c b/lib/nexthop_group.c
index 5ac38d66853cc91a09aa4ebca1ff008c8ba00ad5..23ea96f75c24a4332a9f453b218e9757f0fdc887 100644 (file)
--- a/lib/nexthop_group.c
+++ b/lib/nexthop_group.c
@@ -246,7 +246,7 @@ static void nhgc_delete(struct nexthop_group_cmd *nhgc)
 
        RB_REMOVE(nhgc_entry_head, &nhgc_entries, nhgc);
 
-       list_delete_and_null(&nhgc->nhg_list);
+       list_delete(&nhgc->nhg_list);
 
        XFREE(MTYPE_TMP, nhgc);
 }
@@ -387,6 +387,13 @@ DEFPY(ecmp_nexthops, ecmp_nexthops_cmd,
        struct nexthop *nh;
        bool legal;
 
+       /*
+        * This is impossible to happen as that the cli parser refuses
+        * to let you get here without an addr, but the SA system
+        * does not understand this intricacy
+        */
+       assert(addr);
+
        legal = nexthop_group_parse_nexthop(&nhop, addr, intf, name);
 
        if (nhop.type == NEXTHOP_TYPE_IPV6