check windows fd validity (closes #16992)

benjaminp · benjaminp · commit c68a4a048cf4 · 2013-01-18T00:10:24.000-05:00
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
@@ -222,6 +222,13 @@ def test_issue9324(self):
             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 @@ def handler(signum, frame):
 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
@@ -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
@@ -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;
     }

Original file line number	Diff line number	Diff line change
`@@ -427,7 +427,7 @@ signal_set_wakeup_fd(PyObject self, PyObject args)`
`427`	`427`	`return NULL;`
`428`	`428`	`}`
`429`	`429`	`#endif`
`430`		`- if (fd != -1 && fstat(fd, &buf) != 0) {`
	`430`	`+ if (fd != -1 && (!_PyVerify_fd(fd) \|\| fstat(fd, &buf) != 0)) {`
`431`	`431`	`PyErr_SetString(PyExc_ValueError, "invalid fd");`
`432`	`432`	`return NULL;`
`433`	`433`	`}`