From e3bb770c4f58e36d249eaf5739df99313146af14 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Wed, 11 Apr 2018 17:02:34 +0500 Subject: [PATCH] resolve issue found by cppcheck [zebra/zebra_vxlan.c:5779] -> [zebra/zebra_vxlan.c:5778]: (warning) Either the condition 'if(svi_if_zif&&svi_if_link)' is redundant or there is possible null pointer dereference: svi_if_zif. Signed-off-by: Ilya Shipitsin --- zebra/zebra_vxlan.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c index 7784403fff..65e7a820b0 100644 --- a/zebra/zebra_vxlan.c +++ b/zebra/zebra_vxlan.c @@ -5774,10 +5774,12 @@ int zebra_vxlan_add_del_gw_macip(struct interface *ifp, struct prefix *p, NULL; /* link info for the SVI = bridge info */ svi_if_zif = ifp->info; - svi_if_link = if_lookup_by_index_per_ns( - zebra_ns_lookup(NS_DEFAULT), svi_if_zif->link_ifindex); - if (svi_if_zif && svi_if_link) - zvni = zvni_from_svi(ifp, svi_if_link); + if (svi_if_zif) { + svi_if_link = if_lookup_by_index_per_ns( + zebra_ns_lookup(NS_DEFAULT), svi_if_zif->link_ifindex); + if (svi_if_link) + zvni = zvni_from_svi(ifp, svi_if_link); + } } else if (IS_ZEBRA_IF_BRIDGE(ifp)) { zvni = zvni_from_svi(ifp, ifp); }