Changeset 53510 in vbox

Timestamp:

Dec 11, 2014 2:14:21 PM (10 years ago)

Author:

vboxsync

Message:

NAT: sorecvfrom() - fix Windows assertion on the error leg introduced
in r95188. Ternary operator coerces both alternatives to the same
type, so -1 ends up converted to the wrong type. Rewrite using good
old "if".

File:

• trunk/src/VBox/Devices/Network/slirp/socket.c (modified) (1 diff)

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

@@ -879 +879 @@
                                  (struct sockaddr *)&addr, &addrlen,
                                  NULL, NULL);
-            nread = (status != SOCKET_ERROR) ? nbytes : -1;
+            if (status != SOCKET_ERROR)
+                nread = nbytes;
+            else
+                nread = -1;
         }
 #endif