From 3a1b09e6d070778d78d81084f88d37377d38ee9b Mon Sep 17 00:00:00 2001 From: AN Long Date: Fri, 3 Nov 2023 12:06:51 +0800 Subject: [PATCH] gh-111654: remove redundant decref in LOAD_FROM_DICT_OR_DEREF (#111655) --- Lib/test/test_exceptions.py | 7 +++++++ .../2023-11-03-01-04-55.gh-issue-111654.scUhDO.rst | 2 ++ Python/bytecodes.c | 3 +-- Python/executor_cases.c.h | 3 +-- Python/generated_cases.c.h | 3 +-- 5 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-11-03-01-04-55.gh-issue-111654.scUhDO.rst diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py index 7f1d5ee9322..8ccf08703e5 100644 --- a/Lib/test/test_exceptions.py +++ b/Lib/test/test_exceptions.py @@ -1844,6 +1844,13 @@ class NameErrorTests(unittest.TestCase): self.assertIn("nonsense", err.getvalue()) self.assertIn("ZeroDivisionError", err.getvalue()) + def test_gh_111654(self): + def f(): + class TestClass: + TestClass + + self.assertRaises(NameError, f) + # Note: name suggestion tests live in `test_traceback`. diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-11-03-01-04-55.gh-issue-111654.scUhDO.rst b/Misc/NEWS.d/next/Core and Builtins/2023-11-03-01-04-55.gh-issue-111654.scUhDO.rst new file mode 100644 index 00000000000..e9a896e6609 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2023-11-03-01-04-55.gh-issue-111654.scUhDO.rst @@ -0,0 +1,2 @@ +Fix runtime crash when some error happens in opcode +``LOAD_FROM_DICT_OR_DEREF``. diff --git a/Python/bytecodes.c b/Python/bytecodes.c index 9f1dfa3b723..ddaae32f438 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -1535,10 +1535,8 @@ dummy_func( assert(oparg >= 0 && oparg < _PyFrame_GetCode(frame)->co_nlocalsplus); name = PyTuple_GET_ITEM(_PyFrame_GetCode(frame)->co_localsplusnames, oparg); if (PyMapping_GetOptionalItem(class_dict, name, &value) < 0) { - Py_DECREF(class_dict); GOTO_ERROR(error); } - Py_DECREF(class_dict); if (!value) { PyObject *cell = GETLOCAL(oparg); value = PyCell_GET(cell); @@ -1548,6 +1546,7 @@ dummy_func( } Py_INCREF(value); } + Py_DECREF(class_dict); } inst(LOAD_DEREF, ( -- value)) { diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index 903fc40595c..eb56c34b432 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -1241,10 +1241,8 @@ assert(oparg >= 0 && oparg < _PyFrame_GetCode(frame)->co_nlocalsplus); name = PyTuple_GET_ITEM(_PyFrame_GetCode(frame)->co_localsplusnames, oparg); if (PyMapping_GetOptionalItem(class_dict, name, &value) < 0) { - Py_DECREF(class_dict); GOTO_ERROR(error); } - Py_DECREF(class_dict); if (!value) { PyObject *cell = GETLOCAL(oparg); value = PyCell_GET(cell); @@ -1254,6 +1252,7 @@ } Py_INCREF(value); } + Py_DECREF(class_dict); stack_pointer[-1] = value; break; } diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index 38c368fcc10..5c3a579f79a 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -2204,10 +2204,8 @@ assert(oparg >= 0 && oparg < _PyFrame_GetCode(frame)->co_nlocalsplus); name = PyTuple_GET_ITEM(_PyFrame_GetCode(frame)->co_localsplusnames, oparg); if (PyMapping_GetOptionalItem(class_dict, name, &value) < 0) { - Py_DECREF(class_dict); GOTO_ERROR(error); } - Py_DECREF(class_dict); if (!value) { PyObject *cell = GETLOCAL(oparg); value = PyCell_GET(cell); @@ -2217,6 +2215,7 @@ } Py_INCREF(value); } + Py_DECREF(class_dict); stack_pointer[-1] = value; DISPATCH(); }