Changeset 67170 in vbox for trunk/src/VBox/Runtime/r3/socket.cpp

Timestamp:

May 31, 2017 12:46:24 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

115846

Message:

RTSocketSelectOneEx: Addendeum to r115827: Should set RTSOCKET_EVT_ERROR if the socket closed (see for example rtUdpServerListen). Need to consider possible races with rtSocketCloseIt all the way thru the function.

File:

• trunk/src/VBox/Runtime/r3/socket.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/socket.cpp

@@ -1511 +1511 @@
     AssertReturn(!(fEvents & ~RTSOCKET_EVT_VALID_MASK), VERR_INVALID_PARAMETER);
     AssertReturn(RTMemPoolRefCount(pThis) >= (pThis->cUsers ? 2U : 1U), VERR_CALLER_NO_REFERENCE);
-    int const fdMax = (int)pThis->hNative + 1;
-    AssertReturn((RTSOCKETNATIVE)(fdMax - 1) == pThis->hNative, VERR_INTERNAL_ERROR_5);
+
+    RTSOCKETNATIVE hNative = pThis->hNative;
+    if (hNative == NIL_RTSOCKETNATIVE)
+    {
+        /* Socket is already closed? Possible we raced someone calling rtSocketCloseIt.
+           Should we return a different status code? */
+        *pfEvents = RTSOCKET_EVT_ERROR;
+        return VINF_SUCCESS;
+    }
+
+    int const fdMax = (int)hNative + 1;
+    AssertReturn((RTSOCKETNATIVE)(fdMax - 1) == hNative, VERR_INTERNAL_ERROR_5);
 
     *pfEvents = 0;
@@ -1527 +1537 @@
 
     if (fEvents & RTSOCKET_EVT_READ)
-        FD_SET(pThis->hNative, &fdsetR);
+        FD_SET(hNative, &fdsetR);
     if (fEvents & RTSOCKET_EVT_WRITE)
-        FD_SET(pThis->hNative, &fdsetW);
+        FD_SET(hNative, &fdsetW);
     if (fEvents & RTSOCKET_EVT_ERROR)
-        FD_SET(pThis->hNative, &fdsetE);
+        FD_SET(hNative, &fdsetE);
 
     int rc;
@@ -1545 +1555 @@
     if (rc > 0)
     {
-        if (pThis->hNative != NIL_RTSOCKETNATIVE)
+        if (pThis->hNative == hNative)
         {
-            if (FD_ISSET(pThis->hNative, &fdsetR))
+            if (FD_ISSET(hNative, &fdsetR))
                 *pfEvents |= RTSOCKET_EVT_READ;
-            if (FD_ISSET(pThis->hNative, &fdsetW))
+            if (FD_ISSET(hNative, &fdsetW))
                 *pfEvents |= RTSOCKET_EVT_WRITE;
-            if (FD_ISSET(pThis->hNative, &fdsetE))
+            if (FD_ISSET(hNative, &fdsetE))
                 *pfEvents |= RTSOCKET_EVT_ERROR;
+            rc = VINF_SUCCESS;
         }
-
-        rc = VINF_SUCCESS;
+        else
+        {
+            /* Socket was closed while we waited (rtSocketCloseIt).  Different status code? */
+            *pfEvents = RTSOCKET_EVT_ERROR;
+            rc = VINF_SUCCESS;
+        }
     }
     else if (rc == 0)