Coverity fixes (VPP-1204)

[vpp.git] / src / vnet / srmpls / sr_mpls_policy.c

diff --git a/src/vnet/srmpls/sr_mpls_policy.c b/src/vnet/srmpls/sr_mpls_policy.c
index 1a5ba6c..7d336c1 100755 (executable)
--- a/src/vnet/srmpls/sr_mpls_policy.c
+++ b/src/vnet/srmpls/sr_mpls_policy.c
@@ -34,9 +34,6 @@
 #include <vnet/srmpls/sr_mpls.h>
 #include <vnet/fib/mpls_fib.h>
 #include <vnet/dpo/dpo.h>
-#include <vnet/dpo/replicate_dpo.h>
-#include <vnet/dpo/mpls_label_dpo.h>
-#include <vnet/dpo/lookup_dpo.h>
 #include <vnet/ip/ip.h>
 
 #include <vppinfra/error.h>
@@ -664,6 +661,10 @@ sr_mpls_policy_assign_endpoint_color (mpls_label_t bsid,
       old_value =
        mhash_get ((mhash_t *) endpoint_table, &sr_policy->endpoint);
 
+      /* CID 180995 This should never be NULL unless the two hash tables
+       * get out of sync */
+      ASSERT (old_value != NULL);
+
       fib_prefix_t pfx = { 0 };
       pfx.fp_proto = FIB_PROTOCOL_MPLS;
       pfx.fp_len = 21;
@@ -763,7 +764,11 @@ sr_mpls_policy_assign_endpoint_color (mpls_label_t bsid,
                              FIB_SOURCE_SR,
                              FIB_ENTRY_FLAG_LOOSE_URPF_EXEMPT, paths);
 
-      vec_add1 (path.frp_label_stack, MPLS_IETF_IMPLICIT_NULL_LABEL);
+      fib_mpls_label_t fml = {
+       .fml_value = MPLS_IETF_IMPLICIT_NULL_LABEL,
+      };
+
+      vec_add1 (path.frp_label_stack, fml);
       pfx.fp_eos = MPLS_NON_EOS;
       path.frp_eos = MPLS_NON_EOS;