diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-03-29 23:03:16 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-29 23:03:16 (GMT) |
| commit | ba7f8638f93b5d999b25d8556ca19bdc2e12f359 (patch) | |
| tree | cdb59e3f098d7503faef3ec7a2aeba3a32ff4d4a | |
| parent | 20b2f2bfc2e72c6d9ed983d1f0aa7a141e9b3fc3 (diff) | |
| download | cpython-ba7f8638f93b5d999b25d8556ca19bdc2e12f359.zip cpython-ba7f8638f93b5d999b25d8556ca19bdc2e12f359.tar.gz cpython-ba7f8638f93b5d999b25d8556ca19bdc2e12f359.tar.bz2 | |
bpo-43660: Fix crash when displaying exceptions with custom values for sys.stderr (GH-25075)
(cherry picked from commit 09b90a037d18f5d4acdf1b14082e57bda78e85d3)
Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
| -rw-r--r-- | Lib/test/test_sys.py | 15 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2021-03-29-19-50-34.bpo-43660.scTgag.rst | 3 | ||||
| -rw-r--r-- | Python/pythonrun.c | 3 |
3 files changed, 20 insertions, 1 deletions
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index af0e54b..140c65a 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -1441,6 +1441,21 @@ class SizeofTest(unittest.TestCase): self.assertIsNone(cur.firstiter) self.assertIsNone(cur.finalizer) + def test_changing_sys_stderr_and_removing_reference(self): + # If the default displayhook doesn't take a strong reference + # to sys.stderr the following code can crash. See bpo-43660 + # for more details. + code = textwrap.dedent(''' + import sys + class MyStderr: + def write(self, s): + sys.stderr = None + sys.stderr = MyStderr() + 1/0 + ''') + rc, out, err = assert_python_failure('-c', code) + self.assertEqual(out, b"") + self.assertEqual(err, b"") if __name__ == "__main__": unittest.main() diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-03-29-19-50-34.bpo-43660.scTgag.rst b/Misc/NEWS.d/next/Core and Builtins/2021-03-29-19-50-34.bpo-43660.scTgag.rst new file mode 100644 index 0000000..9841950 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2021-03-29-19-50-34.bpo-43660.scTgag.rst @@ -0,0 +1,3 @@ +Fix crash that happens when replacing ``sys.stderr`` with a callable that +can remove the object while an exception is being printed. Patch by Pablo +Galindo. diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 3831e81..c55e767 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -1034,8 +1034,9 @@ PyErr_Display(PyObject *exception, PyObject *value, PyObject *tb) if (file == Py_None) { return; } - + Py_INCREF(file); _PyErr_Display(file, exception, value, tb); + Py_DECREF(file); } PyObject * |