[ospfd] CID #13, debug for NULL type7 LSA should not print out data from it
2006-05-12 Paul Jakma <paul.jakma@sun.com>
* ospf_lsa.c: (ospf_translated_nssa_refresh) Add non-assert
sanity check, in case DEBUG isn't defined. Debug message
when no type7 exists should print the ID from the type5, not
the type7, fixes CID #13.
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index c9bdff6..96162b0 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -5,7 +5,11 @@
functionality which is never used, hence fixing Coverity CID
#29.
(struct lsa_action) remove unused member.
- * ospf_interface.c: (ospf_if_exists) Fix missing NULL return
+ (ospf_translated_nssa_refresh) Add non-assert sanity check,
+ in case DEBUG isn't defined.
+ Debug message when no type7 exists should print the ID from
+ the type5, not the type7, fixes CID #13.
+ * ospf_interface.c: (ospf_if_exists) Fix missing NULL return
check on ospf_lookup, CID #27.
* ospf_asbr.c: (ospf_redistribute_withdraw) remove ospf_lookup
call by taking the struct ospf * as argument, which the
diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index 9ef5a6a..d2f593e 100644
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -2002,6 +2002,8 @@
/* Sanity checks. */
assert (type7 || type5);
+ if (!type7 || !type5)
+ return NULL;
if (type7)
assert (type7->data);
if (type5)
@@ -2055,7 +2057,7 @@
if (IS_DEBUG_OSPF_NSSA)
zlog_debug ("ospf_translated_nssa_refresh(): no Type-7 found for "
"Type-5 LSA Id %s",
- inet_ntoa (type7->data->id));
+ inet_ntoa (type5->data->id));
return NULL;
}