matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

ospfd: add assert to resolve SA warning

Browse source 
Resolve a couple of SA warnings by asserting that pointers are
valid.

Signed-off-by: Mark Stapp <mjs@cisco.com>
This commit is contained in:
Mark Stapp 2024-09-06 09:15:50 -04:00
parent 7ba895f685
commit 2b2a12b9c8
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ospfd/ospf_flood.c
View 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 == if (ls_rxmt_node->lsa_list_entry ==
ospf_lsa_list_first(&nbr->ls_rxmt_list)) ospf_lsa_list_first(&nbr->ls_rxmt_list))
rxmt_head_replaced = true; rxmt_head_replaced = true;
/* Keep SA happy */
assert(ls_rxmt_node->lsa_list_entry != NULL);
ospf_lsa_list_del(&nbr->ls_rxmt_list, ospf_lsa_list_del(&nbr->ls_rxmt_list,
ls_rxmt_node->lsa_list_entry); ls_rxmt_node->lsa_list_entry);
XFREE(MTYPE_OSPF_LSA_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); ospf_lsdb_delete(&nbr->ls_rxmt, old);
if (IS_DEBUG_OSPF(lsa, LSA_FLOODING)) 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; rxmt_timer_reset = false;
lsa->retransmit_counter--; lsa->retransmit_counter--;
/* Keep SA happy */
assert(ls_rxmt_node->lsa_list_entry != NULL);
ospf_lsa_list_del(&nbr->ls_rxmt_list, ospf_lsa_list_del(&nbr->ls_rxmt_list,
ls_rxmt_node->lsa_list_entry); ls_rxmt_node->lsa_list_entry);
XFREE(MTYPE_OSPF_LSA_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); ospf_lsdb_delete(&nbr->ls_rxmt, lsa);
if (IS_DEBUG_OSPF(lsa, LSA_FLOODING)) if (IS_DEBUG_OSPF(lsa, LSA_FLOODING))