]> git.puffer.fish Git - mirror/frr.git/commitdiff
resolve issue found by cppcheck 2050/head
authorIlya Shipitsin <chipitsine@gmail.com>
Wed, 11 Apr 2018 12:02:34 +0000 (17:02 +0500)
committerIlya Shipitsin <chipitsine@gmail.com>
Wed, 11 Apr 2018 12:02:34 +0000 (17:02 +0500)
[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 <chipitsine@gmail.com>
zebra/zebra_vxlan.c

index 7784403fff836538e6793b36f8912c46988a3dd3..65e7a820b03a01b7d7ee7088227013c23ccb8e68 100644 (file)
@@ -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);
        }