Changeset 37312 in vbox

Timestamp:

Jun 3, 2011 9:00:49 AM (14 years ago)

Author:

vboxsync

Message:

RTProcWait/win: Don't leak opened process handles.

File:

• trunk/src/VBox/Runtime/r3/win/process-win.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r3/win/process-win.cpp

@@ -1174 +1174 @@
      * opening the specified process.
      */
+    HANDLE hOpenedProc = NULL;
     HANDLE hProcess = rtProcWinFindPid(Process);
     if (hProcess == NULL)
-        hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | SYNCHRONIZE, FALSE, Process);
-    if (hProcess != NULL)
+    {
+        hProcess = hOpenedProc = OpenProcess(PROCESS_QUERY_INFORMATION | SYNCHRONIZE, FALSE, Process);
+        if (hProcess == NULL)
+        {
+            DWORD dwErr = GetLastError();
+            if (dwErr == ERROR_INVALID_PARAMETER)
+                return VERR_PROCESS_NOT_FOUND;
+            return RTErrConvertFromWin32(dwErr);
+        }
+    }
+
+    /*
+     * Wait for it to terminate.
+     */
+    int rc;
+    DWORD Millies = fFlags == RTPROCWAIT_FLAGS_BLOCK ? INFINITE : 0;
+    DWORD WaitRc = WaitForSingleObjectEx(hProcess, Millies, TRUE);
+    while (WaitRc == WAIT_IO_COMPLETION)
+        WaitRc = WaitForSingleObjectEx(hProcess, Millies, TRUE);
+    switch (WaitRc)
     {
         /*
-         * Wait for it to terminate.
+         * It has terminated.
          */
-        DWORD Millies = fFlags == RTPROCWAIT_FLAGS_BLOCK ? INFINITE : 0;
-        DWORD WaitRc = WaitForSingleObjectEx(hProcess, Millies, TRUE);
-        while (WaitRc == WAIT_IO_COMPLETION)
-            WaitRc = WaitForSingleObjectEx(hProcess, Millies, TRUE);
-        switch (WaitRc)
-        {
-            /*
-             * It has terminated.
-             */
-            case WAIT_OBJECT_0:
+        case WAIT_OBJECT_0:
+        {
+            DWORD dwExitCode;
+            if (GetExitCodeProcess(hProcess, &dwExitCode))
             {
-                DWORD dwExitCode;
-                if (GetExitCodeProcess(hProcess, &dwExitCode))
+                /** @todo the exit code can be special statuses. */
+                if (pProcStatus)
                 {
-                    /** @todo the exit code can be special statuses. */
-                    if (pProcStatus)
-                    {
-                        pProcStatus->enmReason = RTPROCEXITREASON_NORMAL;
-                        pProcStatus->iStatus = (int)dwExitCode;
-                    }
+                    pProcStatus->enmReason = RTPROCEXITREASON_NORMAL;
+                    pProcStatus->iStatus = (int)dwExitCode;
+                }
+                if (hOpenedProc == NULL)
                     rtProcWinRemovePid(Process);
-                    return VINF_SUCCESS;
-                }
-                break;
+                rc = VINF_SUCCESS;
             }
-
-            /*
-             * It hasn't terminated just yet.
-             */
-            case WAIT_TIMEOUT:
-                return VERR_PROCESS_RUNNING;
-
-            /*
-             * Something went wrong...
-             */
-            case WAIT_FAILED:
-                break;
-            case WAIT_ABANDONED:
-                AssertFailed();
-                return VERR_GENERAL_FAILURE;
-            default:
-                AssertMsgFailed(("WaitRc=%RU32\n", WaitRc));
-                return VERR_GENERAL_FAILURE;
-        }
-    }
-    DWORD dwErr = GetLastError();
-    if (dwErr == ERROR_INVALID_PARAMETER)
-        return VERR_PROCESS_NOT_FOUND;
-    return RTErrConvertFromWin32(dwErr);
+            else
+                rc = RTErrConvertFromWin32(GetLastError());
+            break;
+        }
+
+        /*
+         * It hasn't terminated just yet.
+         */
+        case WAIT_TIMEOUT:
+            rc = VERR_PROCESS_RUNNING;
+            break;
+
+        /*
+         * Something went wrong...
+         */
+        case WAIT_FAILED:
+            rc = RTErrConvertFromWin32(GetLastError());
+            break;
+
+        case WAIT_ABANDONED:
+            AssertFailed();
+            rc = VERR_GENERAL_FAILURE;
+            break;
+
+        default:
+            AssertMsgFailed(("WaitRc=%RU32\n", WaitRc));
+            rc = VERR_GENERAL_FAILURE;
+            break;
+    }
+
+    if (hOpenedProc != NULL)
+        CloseHandle(hOpenedProc);
+    return rc;
 }