check if pid is actually gone in psutil_handle_from_pid_waccess

2 files changed, 13 insertions, 3 deletions

diff --git a/psutil/arch/windows/process_info.c b/psutil/arch/windows/process_info.c
index f514962f..1d47c432 100644
--- a/psutil/arch/windows/process_info.c
+++ b/psutil/arch/windows/process_info.c
@@ -179,8 +179,14 @@ psutil_handle_from_pid_waccess(DWORD pid, DWORD dwDesiredAccess) {
 
     hProcess = OpenProcess(dwDesiredAccess, FALSE, pid);
     if (hProcess == NULL) {
-        if (GetLastError() == ERROR_INVALID_PARAMETER)
+        if (GetLastError() == ERROR_INVALID_PARAMETER) {
+            if (! psutil_assert_pid_not_exists(
+                    pid, "psutil_handle_from_pid_waccess() -> OpenProcess "
+                         "incorrectly assumed process is gone")) {
+                return NULL;
+            }
             NoSuchProcess();
+        }
         else
             PyErr_SetFromWindowsErr(0);
         return NULL;
@@ -272,8 +278,8 @@ psutil_assert_pid_exists(DWORD pid, char *err) {
             PyErr_SetString(PyExc_AssertionError, err);
             return 0;
         }
-        return 1;
     }
+    return 1;
 }
 
 
@@ -284,8 +290,8 @@ psutil_assert_pid_not_exists(DWORD pid, char *err) {
             PyErr_SetString(PyExc_AssertionError, err);
             return 0;
         }
-        return 1;
     }
+    return 1;
 }
 
 
diff --git a/psutil/arch/windows/process_info.h b/psutil/arch/windows/process_info.h
index a3b512e7..a2f70c2b 100644
--- a/psutil/arch/windows/process_info.h
+++ b/psutil/arch/windows/process_info.h
@@ -23,6 +23,10 @@ int psutil_pid_is_running(DWORD pid);
 int psutil_get_proc_info(DWORD pid, PSYSTEM_PROCESS_INFORMATION *retProcess,
                          PVOID *retBuffer);
 
+int psutil_assert_pid_exists(DWORD pid, char *err);
+int psutil_assert_pid_not_exists(DWORD pid, char *err);
+
+
 PyObject* psutil_get_cmdline(long pid);
 PyObject* psutil_get_cwd(long pid);
 PyObject* psutil_get_environ(long pid);