[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.
This commit is contained in:
Paul Jakma 2006-05-12 23:04:45 +00:00
parent 6db3a6f75c
commit bfd7c7dc06
2 changed files with 8 additions and 7 deletions

View File

@ -13,6 +13,9 @@
* ospf_asbr.h: (ospf_redistribute_withdraw) update declaration
* ospf_zebra.c: (ospf_redistribute_unset) update call to
ospf_redistribute_withdraw to match.
* 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.
2006-05-11 Paul Jakma <paul.jakma@sun.com>

View File

@ -464,13 +464,11 @@ ospf_update_router_route (struct ospf *ospf,
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)