diff options
| -rw-r--r-- | Lib/test/test_signal.py | 12 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/signalmodule.c | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index 28037858b0..fa06729b6e 100644 --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -227,6 +227,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): TIMEOUT_FULL = 10 @@ -485,8 +492,9 @@ class ItimerTest(unittest.TestCase): def test_main(): test_support.run_unittest(BasicSignalTests, InterProcessSignalTests, - WakeupSignalTests, SiginterruptTest, - ItimerTest, WindowsSignalTests) + WakeupFDTests, WakeupSignalTests, + SiginterruptTest, ItimerTest, + WindowsSignalTests) if __name__ == "__main__": @@ -189,6 +189,9 @@ Core and Builtins Library ------- +- Issue #16992: On Windows in signal.set_wakeup_fd, validate the file + descriptor argument. + - Issue #15861: tkinter now correctly works with lists and tuples containing strings with whitespaces, backslashes or unbalanced braces. diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index f706a8fd8f..d5d628328b 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -407,7 +407,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; } |