closes-bug:#1393201 Ensuring theat component nexthops exists before a…

…ccesing the composite multicast nexthop Change-Id: I2592047a411917891e4f7df94cd3ac644880e2c1
Juniper · Nov 16, 2014 · 5c5ff8f · 5c5ff8f
1 parent 63b1676
commit 5c5ff8f
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/dp-core/vr_nexthop.c b/dp-core/vr_nexthop.c
@@ -1576,6 +1576,8 @@ nh_composite_mcast_validate(struct vr_nexthop *nh, vr_nexthop_req *req)
         if (tmp_nh && ((tmp_nh->nh_type != NH_COMPOSITE) ||
                  (!(tmp_nh->nh_flags & NH_FLAG_COMPOSITE_FABRIC)))) {
             for (i = 1; i < nh->nh_component_cnt; i++) {
+                if (!nh->nh_component_nh[i].cnh)
+                    continue;
                 if ((nh->nh_component_nh[i].cnh->nh_type == NH_COMPOSITE) && 
                         (nh->nh_component_nh[i].cnh->nh_flags & 
                                         NH_FLAG_COMPOSITE_FABRIC)) {