From: paul <paul>
Date: Tue, 18 Feb 2003 23:25:44 +0000 (+0000)
Subject:  fixes an assert which doesnt seem to take into account that route_node_get
X-Git-Tag: frr-2.0-rc1~4148
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8c80cb7ee950b7f8c728539d965deae91e70a4eb;p=matthieu%2Ffrr.git

 fixes an assert which doesnt seem to take into account that route_node_get
may return an existing node. (if the code wants a /new/ node why not use
route_node_set? if it doesnt mind - then the assert is wrong).

this bug is in zebra.org CVS. (must be an extremely rare/unlikely bug
though).
---

diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c
index f030027327..d94cdb8bf9 100644
--- a/ospfd/ospf_interface.c
+++ b/ospfd/ospf_interface.c
@@ -135,7 +135,10 @@ ospf_add_to_if (struct interface *ifp, struct ospf_interface *oi)
   p.prefixlen = IPV4_MAX_PREFIXLEN;
 
   rn = route_node_get (IF_OIFS (ifp), &p);
-  assert (! rn->info);
+  /* rn->info should either be NULL or equal to this oi
+   * as route_node_get may return an existing node
+   */
+  assert (! rn->info || rn->info == oi);
   rn->info = oi;
 }