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

miss-islington · brandtbucher · web-flow · commit 65e187239a6f · 2019-06-27T09:30:41.000-07:00
(cherry picked from commit 45a30af) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
@@ -1375,6 +1375,7 @@ def test_sched_setaffinity(self):
         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)
 
diff --git a/Misc/NEWS.d/next/Library/2019-06-26-22-25-05.bpo-37420.CxFJ09.rst b/Misc/NEWS.d/next/Library/2019-06-26-22-25-05.bpo-37420.CxFJ09.rst
@@ -0,0 +1,2 @@
+:func:`os.sched_setaffinity` now correctly handles errors that arise during iteration over its ``mask`` argument.
+Patch by Brandt Bucher.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -5809,6 +5809,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)) {

Original file line number	Diff line number	Diff 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.`
Original file line number	Diff line number	Diff line change
`@@ -5809,6 +5809,9 @@ os_sched_setaffinity_impl(PyObject module, pid_t pid, PyObject mask)`
`5809`	`5809`	`}`
`5810`	`5810`	`CPU_SET_S(cpu, setsize, cpu_set);`
`5811`	`5811`	`}`
	`5812`	`+ if (PyErr_Occurred()) {`
	`5813`	`+ goto error;`
	`5814`	`+ }`
`5812`	`5815`	`Py_CLEAR(iterator);`
`5813`	`5816`
`5814`	`5817`	`if (sched_setaffinity(pid, setsize, cpu_set)) {`