aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2016-11-17 11:36:59 -0500
committerDamjan Marion <dmarion.lists@gmail.com>2016-11-17 20:51:43 +0000
commit75665d3ea133f9978bb31ad6877166872cad1139 (patch)
treeb2e75befddb8c763616ee7b70bd6f79fc840fd5a
parent0bd36eac4758f785ae9e2c006894b6935f0f70f2 (diff)
Fix coverity warnings, VPP-486
Change-Id: If98e5e00eede8f2aa9f17517c726b337c98e5467 Signed-off-by: Dave Barach <dave@barachs.net>
-rw-r--r--vnet/vnet/l2tp/decap.c3
-rw-r--r--vpp-api-test/vat/api_format.c10
2 files changed, 12 insertions, 1 deletions
diff --git a/vnet/vnet/l2tp/decap.c b/vnet/vnet/l2tp/decap.c
index e91e6fbb96f..ee307b642d8 100644
--- a/vnet/vnet/l2tp/decap.c
+++ b/vnet/vnet/l2tp/decap.c
@@ -126,7 +126,7 @@ last_stage (vlib_main_t * vm, vlib_node_runtime_t * node, u32 bi)
vlib_error_main_t *em = &vm->error_main;
l2tpv3_header_t *l2tp;
u32 counter_index;
- l2t_session_t *session;
+ l2t_session_t *session = 0;
u32 session_index;
u32 next_index;
u8 l2tp_decap_local = (l2t_decap_local_node.index == n->index);
@@ -218,6 +218,7 @@ done:
else
{
/* Go to next node on the ip6 configuration chain */
+ ASSERT (session);
vnet_feature_next (session->sw_if_index, &next_index, b);
}
}
diff --git a/vpp-api-test/vat/api_format.c b/vpp-api-test/vat/api_format.c
index c1701476b31..aa875256679 100644
--- a/vpp-api-test/vat/api_format.c
+++ b/vpp-api-test/vat/api_format.c
@@ -6492,6 +6492,9 @@ api_mpls_ethernet_add_del_tunnel (vat_main_t * vam)
u32 tx_sw_if_index;
int tx_sw_if_index_set = 0;
+ /* Shut up coverity */
+ memset (dst_mac_address, 0, sizeof (dst_mac_address));
+
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
if (unformat (i, "vrf %d", &inner_vrf_id))
@@ -10581,6 +10584,9 @@ api_create_vhost_user_if (vat_main_t * vam)
u8 hwaddr[6];
u8 use_custom_mac = 0;
+ /* Shut up coverity */
+ memset (hwaddr, 0, sizeof (hwaddr));
+
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
if (unformat (i, "socket %s", &file_name))
@@ -16112,6 +16118,10 @@ api_l2_interface_pbb_tag_rewrite (vat_main_t * vam)
u32 sid = ~0;
u32 tmp;
+ /* Shut up coverity */
+ memset (dmac, 0, sizeof (dmac));
+ memset (smac, 0, sizeof (smac));
+
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))