closes bpo-37420: Handle errors during iteration in os.sched_setaffinity. (GH-14414)

This commit is contained in:
Brandt Bucher 2019-06-27 09:10:57 -07:00 committed by Benjamin Peterson
parent 97d15b1ee0
commit 45a30af109
3 changed files with 6 additions and 0 deletions

View File

@ -1368,6 +1368,7 @@ class PosixTester(unittest.TestCase):
self.assertEqual(posix.sched_getaffinity(0), mask)
self.assertRaises(OSError, posix.sched_setaffinity, 0, [])
self.assertRaises(ValueError, posix.sched_setaffinity, 0, [-10])
self.assertRaises(ValueError, posix.sched_setaffinity, 0, map(int, "0X"))
self.assertRaises(OverflowError, posix.sched_setaffinity, 0, [1<<128])
self.assertRaises(OSError, posix.sched_setaffinity, -1, mask)

View File

@ -0,0 +1,2 @@
:func:`os.sched_setaffinity` now correctly handles errors that arise during iteration over its ``mask`` argument.
Patch by Brandt Bucher.

View File

@ -6413,6 +6413,9 @@ os_sched_setaffinity_impl(PyObject *module, pid_t pid, PyObject *mask)
}
CPU_SET_S(cpu, setsize, cpu_set);
}
if (PyErr_Occurred()) {
goto error;
}
Py_CLEAR(iterator);
if (sched_setaffinity(pid, setsize, cpu_set)) {