[ospfd] CID #14, NULL check ospf->backbone before use, ospf_update_router_route
2006-05-12 Paul Jakma <paul.jakma@sun.com>
* ospf_ia.c: (ospf_update_router_route) ospf->backbone could be
NULL when passed to ospf_find_asbr_route_through_area,
check for NULL first, CID #14.
diff --git a/ospfd/ospf_ia.c b/ospfd/ospf_ia.c
index a701e8c..6a8c3c6 100644
--- a/ospfd/ospf_ia.c
+++ b/ospfd/ospf_ia.c
@@ -464,13 +464,11 @@
if ((ospf->backbone == NULL) &&
(ospf->abr_type != OSPF_ABR_SHORTCUT))
-
- /* no BB area, not Shortcut ABR, exiting */
- return;
-
- or = ospf_find_asbr_route_through_area (rtrs, p, ospf->backbone);
-
- if (or == NULL)
+ return; /* no BB area, not Shortcut ABR, exiting */
+
+ /* find the backbone route, if possible */
+ if ((ospf->backbone == NULL)
+ || !(or = ospf_find_asbr_route_through_area (rtrs, p, ospf->backbone)))
{
if (ospf->abr_type != OSPF_ABR_SHORTCUT)