From c33cb9fba6925d14b5b9d81ee74f84b23b425732 Mon Sep 17 00:00:00 2001 From: Mark Stapp Date: Thu, 25 Mar 2021 13:23:44 -0400 Subject: [PATCH 1/2] isisd: fix coverity SA warning Add assert to clear SA warning. Signed-off-by: Mark Stapp --- isisd/isis_snmp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/isisd/isis_snmp.c b/isisd/isis_snmp.c index 522026dde4..fe6a2f4052 100644 --- a/isisd/isis_snmp.c +++ b/isisd/isis_snmp.c @@ -1037,6 +1037,8 @@ static int isis_snmp_circuit_level_lookup_next( break; } + assert(oid_idx != NULL); + /* We have to check level specified by index */ if (oid_idx[1] < IS_LEVEL_1) { level = IS_LEVEL_1; From ee6ccc96b4a0c266760a7a413099489658c03e3f Mon Sep 17 00:00:00 2001 From: Mark Stapp Date: Thu, 25 Mar 2021 13:44:50 -0400 Subject: [PATCH 2/2] ospf6d: fix unguarded debug Put a debug under a conditional. Signed-off-by: Mark Stapp --- ospf6d/ospf6_asbr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c index 3497b26656..7894924a8e 100644 --- a/ospf6d/ospf6_asbr.c +++ b/ospf6d/ospf6_asbr.c @@ -1096,8 +1096,10 @@ void ospf6_asbr_send_externals_to_area(struct ospf6_area *oa) for (ALL_LSDB(oa->ospf6->lsdb, lsa, lsanext)) { if (ntohs(lsa->header->type) == OSPF6_LSTYPE_AS_EXTERNAL) { - zlog_debug("%s: Flooding AS-External LSA %s", - __func__, lsa->name); + if (IS_OSPF6_DEBUG_ASBR) + zlog_debug("%s: Flooding AS-External LSA %s", + __func__, lsa->name); + ospf6_flood_area(NULL, lsa, oa); } }