commit 106e38e4d42ecd94c083907872d514e8c67036f6
author Christian Franke <nobody@nowhere.ws> Sun Apr 03 12:46:25 2016 -0300
committer Donald Sharp <sharpd@cumulusnetworks.com> Fri Apr 22 08:33:46 2016 -0400
tree 62bbf4b4203df99f92672f91cd361aa6f055a4df
parent 86c5d2ee68f7b9c00ae4aeb5c8b3c5d82c5ebffc

isisd: work around route table asserts for deleting node with info

The route table code in lib/table.c triggers an assertion when a route
node with rn->info != NULL reaches refcount 0, probably to avoid
memleaks. In this particular case, this is not an issue, since the
info will be freed by the destructor.

However, since removing this assertion probably requires more
discussion, just make sure that rn->info gets freed and unset before
its refcount is decremented to zero.

Signed-off-by: Christian Franke <nobody@nowhere.ws>

isisd/isis_redist.c

diff --git a/isisd/isis_redist.c b/isisd/isis_redist.c
index abb9ecd..690ae47 100644
--- a/isisd/isis_redist.c
+++ b/isisd/isis_redist.c
@@ -176,6 +176,7 @@
   if (!er_node->info)
     return;
 
+  XFREE(MTYPE_ISIS, er_node->info);
   route_unlock_node(er_node);
   lsp_regenerate_schedule(area, level, 0);
 }
@@ -358,6 +359,7 @@
         isis_redist_uninstall(area, level, p);
       }
 
+  XFREE(MTYPE_ISIS, ei_node->info);
   route_unlock_node(ei_node);
 }
 
@@ -502,6 +504,7 @@
             continue;
         }
 
+      XFREE(MTYPE_ISIS, rn->info);
       route_unlock_node(rn);
     }