Skip to content

Commit 45a30af

Browse files
brandtbucherbenjaminp
authored andcommitted
closes bpo-37420: Handle errors during iteration in os.sched_setaffinity. (GH-14414)
1 parent 97d15b1 commit 45a30af

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

Lib/test/test_posix.py

+1
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

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

+3
Original file line numberDiff line numberDiff line change
@@ -6413,6 +6413,9 @@ os_sched_setaffinity_impl(PyObject *module, pid_t pid, PyObject *mask)
64136413
}
64146414
CPU_SET_S(cpu, setsize, cpu_set);
64156415
}
6416+
if (PyErr_Occurred()) {
6417+
goto error;
6418+
}
64166419
Py_CLEAR(iterator);
64176420

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

0 commit comments

Comments
 (0)