Merge "NULL check for the presence of nexthop table" into R2.20

Juniper · May 23, 2015 · b7805d9 · b7805d9
2 parents 617938c + 8d049f3
commit b7805d9
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/dp-core/vr_nexthop.c b/dp-core/vr_nexthop.c
@@ -2566,6 +2566,9 @@ nh_table_exit(struct vrouter *router, bool soft_reset)
     unsigned int i;
     struct vr_nexthop *nh;
 
+    if (!router->vr_nexthops)
+        return;
+
     for (i = 0; i < router->vr_max_nexthops; i++) {
         if (soft_reset && i == NH_DISCARD_ID)
             continue;