Changeset 83580 in vbox for trunk/src

Timestamp:

Apr 6, 2020 1:15:02 AM (5 years ago)

Author:

vboxsync

Message:

NAT: bugref:9703 - checking for the value of a switch variable in a
case for a different value doesn't really work. While here, add a few
defensive checks/assertions.

File:

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

trunk/src/VBox/Devices/Network/slirp/bootp.c

@@ -388 +388 @@
 static int dhcp_send_ack(PNATState pData, struct bootp_t *bp, BOOTPClient *bc, struct mbuf *m, int fDhcpRequest)
 {
+    AssertReturn(bc != NULL, -1);
+
     int offReply = 0; /* boot_reply will fill general options and add END before sending response */
 
@@ -571 +573 @@
             break;
 
+        case REBINDING:
+            LogRel(("NAT: REBINDING state isn't impemented\n"));
+            return -1;
+
+        case SELECTING:
+            LogRel(("NAT: SELECTING state isn't impemented\n"));
+            return -1;
+
         case NONE:
-            if (dhcp_stat == REBINDING)
-                LogRel(("NAT: REBINDING state isn't impemented\n"));
-            else if (dhcp_stat == SELECTING)
-                LogRel(("NAT: SELECTING state isn't impemented\n"));
             return -1;
 
@@ -581 +587 @@
             break;
     }
+
+    if (bc == NULL)
+        return -1;
 
     LogRel(("NAT: DHCP offered IP address %RTnaipv4\n", bc->addr.s_addr));