Changeset 57882 in vbox for trunk/src/VBox/Devices/Serial/DrvNamedPipe.cpp

Timestamp:

Sep 24, 2015 2:40:39 PM (10 years ago)

Author:

vboxsync

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

102848

Message:

Serial/NamedPipe: Reorder error checks in the receive code path on Windows. Looks like Kaspersky AV changes the behavior of the named pipe API when hooking into it, always returning ERROR_IO_PENDING on an overlapped read even if no other process connected to the named pipe yet. ERROR_PIPE_LISTENING is returned as the overlapped result making our error checks trip and aborting the receive thread. The fix moves the check for ERROR_IO_PENDING to the front so it executed first and the check for other non fatal errors is done afterwards

File:

• trunk/src/VBox/Devices/Serial/DrvNamedPipe.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Serial/DrvNamedPipe.cpp

@@ -116 +116 @@
             DWORD uError = GetLastError();
 
+            if (uError == ERROR_IO_PENDING)
+            {
+                uError = 0;
+
+                /* Wait for incoming bytes. */
+                if (GetOverlappedResult(pThis->NamedPipe, &pThis->OverlappedRead, &cbReallyRead, TRUE) == FALSE)
+                    uError = GetLastError();
+            }
+
             if (   uError == ERROR_PIPE_LISTENING
                 || uError == ERROR_PIPE_NOT_CONNECTED)
@@ -127 +136 @@
             else
             {
-                if (uError == ERROR_IO_PENDING)
-                {
-                    uError = 0;
-
-                    /* Wait for incoming bytes. */
-                    if (GetOverlappedResult(pThis->NamedPipe, &pThis->OverlappedRead, &cbReallyRead, TRUE) == FALSE)
-                        uError = GetLastError();
-                }
-
                 rc = RTErrConvertFromWin32(uError);
                 Log(("drvNamedPipeRead: ReadFile returned %d (%Rrc)\n", uError, rc));