mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-14 18:27:21 +00:00
[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:
parent
6db3a6f75c
commit
bfd7c7dc06
@ -13,6 +13,9 @@
|
|||||||
* ospf_asbr.h: (ospf_redistribute_withdraw) update declaration
|
* ospf_asbr.h: (ospf_redistribute_withdraw) update declaration
|
||||||
* ospf_zebra.c: (ospf_redistribute_unset) update call to
|
* ospf_zebra.c: (ospf_redistribute_unset) update call to
|
||||||
ospf_redistribute_withdraw to match.
|
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>
|
2006-05-11 Paul Jakma <paul.jakma@sun.com>
|
||||||
|
|
||||||
|
@ -464,13 +464,11 @@ ospf_update_router_route (struct ospf *ospf,
|
|||||||
|
|
||||||
if ((ospf->backbone == NULL) &&
|
if ((ospf->backbone == NULL) &&
|
||||||
(ospf->abr_type != OSPF_ABR_SHORTCUT))
|
(ospf->abr_type != OSPF_ABR_SHORTCUT))
|
||||||
|
return; /* no BB area, not Shortcut ABR, exiting */
|
||||||
|
|
||||||
/* no BB area, not Shortcut ABR, exiting */
|
/* find the backbone route, if possible */
|
||||||
return;
|
if ((ospf->backbone == NULL)
|
||||||
|
|| !(or = ospf_find_asbr_route_through_area (rtrs, p, ospf->backbone)))
|
||||||
or = ospf_find_asbr_route_through_area (rtrs, p, ospf->backbone);
|
|
||||||
|
|
||||||
if (or == NULL)
|
|
||||||
{
|
{
|
||||||
if (ospf->abr_type != OSPF_ABR_SHORTCUT)
|
if (ospf->abr_type != OSPF_ABR_SHORTCUT)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user