fix vector index range checks

[vpp.git] / src / vnet / util / trajectory.c

diff --git a/src/vnet/util/trajectory.c b/src/vnet/util/trajectory.c
index 24b5125..2538c7e 100644 (file)
--- a/src/vnet/util/trajectory.c
+++ b/src/vnet/util/trajectory.c
@@ -44,7 +44,7 @@ vnet_dump_trajectory_trace (vlib_main_t * vm, u32 bi)
 
       node_index = trace[i];
 
-      if (node_index > vec_len (vnm->nodes))
+      if (node_index >= vec_len (vnm->nodes))
        {
          fformat (stderr, "Skip bogus node index %d\n", node_index);
          continue;
@@ -64,7 +64,11 @@ vnet_dump_trajectory_trace (vlib_main_t * vm, u32 bi)
 void
 init_trajectory_trace (vlib_buffer_t * b)
 {
-  vec_validate (vnet_buffer2 (b)->trajectory_trace, 7);
+  if (!clib_mem_is_vec (vnet_buffer2 (b)->trajectory_trace))
+    {
+      vnet_buffer2 (b)->trajectory_trace = 0;
+      vec_validate (vnet_buffer2 (b)->trajectory_trace, 7);
+    }
   _vec_len (vnet_buffer2 (b)->trajectory_trace) = 0;
 }