]> git.puffer.fish Git - mirror/frr.git/commitdiff
ospfd: add assert to resolve SA warning 16757/head
authorMark Stapp <mjs@cisco.com>
Fri, 6 Sep 2024 13:15:50 +0000 (09:15 -0400)
committerMark Stapp <mjs@cisco.com>
Fri, 6 Sep 2024 13:15:50 +0000 (09:15 -0400)
Resolve a couple of SA warnings by asserting that pointers are
valid.

Signed-off-by: Mark Stapp <mjs@cisco.com>
ospfd/ospf_flood.c

index 2af4ae31709800d272e15af801db94be32833aaa..40a76a0a34d7bb72103122d9c9f69702806e31c4 100644 (file)
@@ -1094,8 +1094,13 @@ void ospf_ls_retransmit_add(struct ospf_neighbor *nbr, struct ospf_lsa *lsa)
                        if (ls_rxmt_node->lsa_list_entry ==
                            ospf_lsa_list_first(&nbr->ls_rxmt_list))
                                rxmt_head_replaced = true;
+
+                       /* Keep SA happy */
+                       assert(ls_rxmt_node->lsa_list_entry != NULL);
+
                        ospf_lsa_list_del(&nbr->ls_rxmt_list,
                                          ls_rxmt_node->lsa_list_entry);
+
                        XFREE(MTYPE_OSPF_LSA_LIST, ls_rxmt_node->lsa_list_entry);
                        ospf_lsdb_delete(&nbr->ls_rxmt, old);
                        if (IS_DEBUG_OSPF(lsa, LSA_FLOODING))
@@ -1163,8 +1168,13 @@ void ospf_ls_retransmit_delete(struct ospf_neighbor *nbr, struct ospf_lsa *lsa)
                        rxmt_timer_reset = false;
 
                lsa->retransmit_counter--;
+
+               /* Keep SA happy */
+               assert(ls_rxmt_node->lsa_list_entry != NULL);
+
                ospf_lsa_list_del(&nbr->ls_rxmt_list,
                                  ls_rxmt_node->lsa_list_entry);
+
                XFREE(MTYPE_OSPF_LSA_LIST, ls_rxmt_node->lsa_list_entry);
                ospf_lsdb_delete(&nbr->ls_rxmt, lsa);
                if (IS_DEBUG_OSPF(lsa, LSA_FLOODING))