Changeset 61905 in vbox for trunk

Timestamp:

Jun 27, 2016 4:26:41 PM (8 years ago)

Author:

vboxsync

Message:

NAT/libalias: Fix cppcheck complaint by applying FreeBSD's revisions
190938 and 190941 - check the right error code and check it early.

File:

• trunk/src/VBox/Devices/Network/slirp/libalias/alias.c (modified) (3 diffs)

trunk/src/VBox/Devices/Network/slirp/libalias/alias.c

@@ -751 +751 @@
         u_short alias_port;
         int accumulate;
-        int r = 0, error;
+        int error;
         struct alias_data ad;
         ad.lnk = lnk;
@@ -769 +769 @@
         /* Walk out chain. */
         error = find_handler(IN, UDP, la, pip, &ad);
+        /* If we cannot figure out the packet, ignore it. */
+        if (error < 0)
+            return (PKT_ALIAS_IGNORED);
 
 /* If UDP checksum is not zero, then adjust since destination port */
@@ -784 +787 @@
         pip->ip_dst = original_address;
 
-        /*
-         * If we cannot figure out the packet, ignore it.
-         */
-        if (r < 0)
-            return (PKT_ALIAS_IGNORED);
-        else
-            return (PKT_ALIAS_OK);
+        return (PKT_ALIAS_OK);
     }
     return (PKT_ALIAS_IGNORED);