Issue #23524: Replace _PyVerify_fd function with calls to _set_thread_local_invalid_parameter_handler.

2015-04-12 00:26:27 -04:00
parent fe0a41aae4
commit 8fc8980c96
11 changed files with 150 additions and 69 deletions
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -1068,11 +1068,12 @@ is_valid_fd(int fd)
    int dummy_fd;
    if (fd < 0 || !_PyVerify_fd(fd))
        return 0;
+    _Py_BEGIN_SUPPRESS_IPH
    dummy_fd = dup(fd);
-    if (dummy_fd < 0)
-        return 0;
-    close(dummy_fd);
-    return 1;
+    if (dummy_fd >= 0)
+        close(dummy_fd);
+    _Py_END_SUPPRESS_IPH
+    return dummy_fd >= 0;
 }

 /* Initialize sys.stdin, stdout, stderr and builtins.open */