Skip to content

Commit 6fbed53

Browse files
closes bpo-37420: Handle errors during iteration in os.sched_setaffinity. (GH-14414)
(cherry picked from commit 45a30af) Co-authored-by: Brandt Bucher <[email protected]>
1 parent 4cbe7a3 commit 6fbed53

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

Lib/test/test_posix.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1368,6 +1368,7 @@ def test_sched_setaffinity(self):
13681368
self.assertEqual(posix.sched_getaffinity(0), mask)
13691369
self.assertRaises(OSError, posix.sched_setaffinity, 0, [])
13701370
self.assertRaises(ValueError, posix.sched_setaffinity, 0, [-10])
1371+
self.assertRaises(ValueError, posix.sched_setaffinity, 0, map(int, "0X"))
13711372
self.assertRaises(OverflowError, posix.sched_setaffinity, 0, [1<<128])
13721373
self.assertRaises(OSError, posix.sched_setaffinity, -1, mask)
13731374

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
:func:`os.sched_setaffinity` now correctly handles errors that arise during iteration over its ``mask`` argument.
2+
Patch by Brandt Bucher.

Modules/posixmodule.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6416,6 +6416,9 @@ os_sched_setaffinity_impl(PyObject *module, pid_t pid, PyObject *mask)
64166416
}
64176417
CPU_SET_S(cpu, setsize, cpu_set);
64186418
}
6419+
if (PyErr_Occurred()) {
6420+
goto error;
6421+
}
64196422
Py_CLEAR(iterator);
64206423

64216424
if (sched_setaffinity(pid, setsize, cpu_set)) {

0 commit comments

Comments
 (0)