From e07a52f272f00b6707b40f557e481749b73dd0fd Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Sun, 12 Apr 2015 00:26:27 -0400 Subject: Issue #23524: Replace _PyVerify_fd function with calls to _set_thread_local_invalid_parameter_handler. --- Python/pylifecycle.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Python/pylifecycle.c') diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index e5645494e6..56186778f4 100644 --- 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 */ -- cgit v1.2.1