diff options
| author | paul <paul> | 2006-05-12 23:04:45 +0000 |
|---|---|---|
| committer | paul <paul> | 2006-05-12 23:04:45 +0000 |
| commit | 59d29b2d79faa1b430b3f518253c25473be2b9c7 (patch) | |
| tree | 99769f05e2803a171d72e6b8708ff5f015204730 /ospfd/ospf_ia.c | |
| parent | 74bfdffb09aa397a1c665b77bec430ee1eb3bc7d (diff) | |
| download | quagga-59d29b2d79faa1b430b3f518253c25473be2b9c7.tar.bz2 quagga-59d29b2d79faa1b430b3f518253c25473be2b9c7.tar.xz | |
[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.
Diffstat (limited to 'ospfd/ospf_ia.c')
| -rw-r--r-- | ospfd/ospf_ia.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ospfd/ospf_ia.c b/ospfd/ospf_ia.c index a701e8c9..6a8c3c63 100644 --- a/ospfd/ospf_ia.c +++ b/ospfd/ospf_ia.c @@ -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) |