check windows fd validity (closes #16992)

diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index e87900a086d0320e429f776f97824de8d24cfb79..99243dffe104ab8c7829f8eff7b834c047fa9b7f 100644 (file)
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -222,6 +222,13 @@ class WindowsSignalTests(unittest.TestCase):
             signal.signal(7, handler)
 
 
+class WakeupFDTests(unittest.TestCase):
+
+    def test_invalid_fd(self):
+        fd = support.make_bad_fd()
+        self.assertRaises(ValueError, signal.set_wakeup_fd, fd)
+
+
 @unittest.skipIf(sys.platform == "win32", "Not valid on Windows")
 class WakeupSignalTests(unittest.TestCase):
     def check_wakeup(self, test_body, *signals, ordered=True):
@@ -864,8 +871,8 @@ class PendingSignalsTests(unittest.TestCase):
 def test_main():
     try:
         support.run_unittest(PosixTests, InterProcessSignalTests,
-                             WakeupSignalTests, SiginterruptTest,
-                             ItimerTest, WindowsSignalTests,
+                             WakeupFDTests, WakeupSignalTests,
+                             SiginterruptTest, ItimerTest, WindowsSignalTests,
                              PendingSignalsTests)
     finally:
         support.reap_children()

diff --git a/Misc/NEWS b/Misc/NEWS
index 11fa1f351d71fbbf2ed437bbe3e4a1d30a9e5a36..d7e01a7cabdea4aea5c9d5dab701d271be680c8b 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -150,6 +150,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #16992: On Windows in signal.set_wakeup_fd, validate the file
+  descriptor argument.
+
 - Issue #16422: For compatibility with the Python version, the C version of
   decimal now uses strings instead of integers for rounding mode constants.
 

diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index eb89a03d991fe339dec678f3a8407b0b9ba192d7..0aac98b325ad2c89b685b8316d019a956433c09c 100644 (file)
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -427,7 +427,7 @@ signal_set_wakeup_fd(PyObject *self, PyObject *args)
         return NULL;
     }
 #endif
-    if (fd != -1 && fstat(fd, &buf) != 0) {
+    if (fd != -1 && (!_PyVerify_fd(fd) || fstat(fd, &buf) != 0)) {
         PyErr_SetString(PyExc_ValueError, "invalid fd");
         return NULL;
     }