Fix output feature processing (VPP-670)

[vpp.git] / src / vnet / adj / adj_nbr.c

diff --git a/src/vnet/adj/adj_nbr.c b/src/vnet/adj/adj_nbr.c
index 61b5c83..072abd0 100644 (file)
--- a/src/vnet/adj/adj_nbr.c
+++ b/src/vnet/adj/adj_nbr.c
@@ -162,13 +162,12 @@ adj_nbr_evaluate_feature (adj_index_t ai)
     }
 
     sw_if_index = adj->rewrite_header.sw_if_index;
-    vec_validate (fm->feature_count_by_sw_if_index[arc_index], sw_if_index);
-    feature_count = fm->feature_count_by_sw_if_index[arc_index][sw_if_index];
-
-    if (feature_count > 0)
-        adj->rewrite_header.flags |= VNET_REWRITE_HAS_FEATURES;
-    else
-        adj->rewrite_header.flags &= ~VNET_REWRITE_HAS_FEATURES;
+    if (vec_len(fm->feature_count_by_sw_if_index[arc_index]) > sw_if_index)
+    {
+        feature_count = fm->feature_count_by_sw_if_index[arc_index][sw_if_index];
+        if (feature_count > 0)
+            adj->rewrite_header.flags |= VNET_REWRITE_HAS_FEATURES;
+    }
 
     return;
 }