diff options
| author | paul <paul> | 2005-11-11 12:10:03 +0000 |
|---|---|---|
| committer | paul <paul> | 2005-11-11 12:10:03 +0000 |
| commit | fd036ca7dbead2c524805913f0ba2ae860e45939 (patch) | |
| tree | 000557928d3683bdd15110f1ba1dabee91138c0f | |
| parent | 74acd2d43e6faa14533b8dc7e2721395c05ad283 (diff) | |
| download | quagga.0.99.2.release.tar.bz2 quagga.0.99.2.release.tar.xz | |
[ospfd] SPF ospf_canonical_nexthops_free bugfix.quagga.0.99.2.release
| -rw-r--r-- | ospfd/ChangeLog | 7 | ||||
| -rw-r--r-- | ospfd/ospf_spf.c | 11 |
2 files changed, 17 insertions, 1 deletions
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog index 7b77cb4e..751f5d36 100644 --- a/ospfd/ChangeLog +++ b/ospfd/ChangeLog @@ -1,3 +1,10 @@ +2005-11-11 Paul Jakma <paul.jakma@sun.com> + + * ospf_spf.c: (ospf_canonical_nexthops_free) Free only + the nexthops pointing to the root vertex. We may visit a + vertex twice or the vertex may have some inherited nexthops, + if we free other nexthops we could crash. + 2005-11-04 Paul Jakma <paul.jakma@sun.com> * ospf_{dump,spf,vty}.c: Oops, use the internal tv_sub diff --git a/ospfd/ospf_spf.c b/ospfd/ospf_spf.c index 564ae847..dbd06361 100644 --- a/ospfd/ospf_spf.c +++ b/ospfd/ospf_spf.c @@ -94,11 +94,20 @@ ospf_canonical_nexthops_free (struct vertex *root) struct listnode *n2, *nn2; struct vertex_parent *vp; + /* router vertices through an attached network each + * have a distinct (canonical / not inherited) nexthop + * which must be freed. + * + * A network vertex can only have router vertices as its + * children, so only one level of recursion is possible. + */ if (child->type == OSPF_VERTEX_NETWORK) ospf_canonical_nexthops_free (child); + /* Free child nexthops pointing back to this root vertex */ for (ALL_LIST_ELEMENTS (child->parents, n2, nn2, vp)) - vertex_nexthop_free (vp->nexthop); + if (vp->parent == root) + vertex_nexthop_free (vp->nexthop); } } |