From: Daniel Walton <dwalton@cumulusnetworks.com>
Date: Tue, 1 Dec 2015 18:32:33 +0000 (+0000)
Subject: Zebra: crash in zebra_deregister_rnh_static_nexthops
X-Git-Tag: frr-2.0-rc1~1180
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b046b633c5f6a4dc9f565cbd808c3580f92f0044;p=mirror%2Ffrr.git

Zebra: crash in zebra_deregister_rnh_static_nexthops

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c
index 9232123089..62ae3e7bd3 100644
--- a/zebra/zebra_rnh.c
+++ b/zebra/zebra_rnh.c
@@ -690,8 +690,8 @@ free_state (struct rib *rib, struct route_node *rn)
     return;
 
   /* free RIB and nexthops */
-  nexthops_free(rib->nexthop);
   zebra_deregister_rnh_static_nexthops (rib->nexthop, rn);
+  nexthops_free(rib->nexthop);
   XFREE (MTYPE_RIB, rib);
 }