From 64eb259cc1e42a5f74b5911a518d2c50daa8d50b Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Mon, 12 Oct 2020 18:53:16 -0500 Subject: [PATCH] bpo-40422: Move _Py_*_SUPPRESS_IPH bits into _Py_closerange (GH-22672) This suppression is no longer needed in os_closerange_impl, as it just invokes the internal _Py_closerange implementation. On the other hand, consumers of _Py_closerange may not have any other reason to suppress invalid parameter issues, so narrow the scope to here. --- Modules/posixmodule.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 2e0caaa3e56..de81db8b84f 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -8782,6 +8782,7 @@ void _Py_closerange(int first, int last) { first = Py_MAX(first, 0); + _Py_BEGIN_SUPPRESS_IPH #ifdef HAVE_CLOSE_RANGE if (close_range(first, last, 0) == 0 || errno != ENOSYS) { /* Any errors encountered while closing file descriptors are ignored; @@ -8812,6 +8813,7 @@ _Py_closerange(int first, int last) } } #endif /* USE_FDWALK */ + _Py_END_SUPPRESS_IPH } /*[clinic input] @@ -8829,9 +8831,7 @@ os_closerange_impl(PyObject *module, int fd_low, int fd_high) /*[clinic end generated code: output=0ce5c20fcda681c2 input=5855a3d053ebd4ec]*/ { Py_BEGIN_ALLOW_THREADS - _Py_BEGIN_SUPPRESS_IPH _Py_closerange(fd_low, fd_high - 1); - _Py_END_SUPPRESS_IPH Py_END_ALLOW_THREADS Py_RETURN_NONE; }