Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[3.11] GH-99298: Don't perform jumps before error handling (GH-99343)

Browse source
This commit is contained in:
Brandt Bucher 2022-11-11 03:30:21 -08:00 • committed by GitHub
parent b31b64570a
commit 1119ee4f7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS.d/next/Core and Builtins/2022-11-10-02-11-23.gh-issue-99298.NeArAJ.rst Normal file
View file

@ -0,0 +1,2 @@
Fix an issue that could potentially cause incorrect error handling for some
bytecode instructions.

14
Python/ceval.c
View file

@ -2158,6 +2158,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
PyObject *container = SECOND(); PyObject *container = SECOND();
next_instr--; next_instr--;
if (_Py_Specialize_BinarySubscr(container, sub, next_instr) < 0) { if (_Py_Specialize_BinarySubscr(container, sub, next_instr) < 0) {
next_instr++;
goto error; goto error;
} }
DISPATCH_SAME_OPARG(); DISPATCH_SAME_OPARG();
@ -2323,6 +2324,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
PyObject *container = SECOND(); PyObject *container = SECOND();
next_instr--; next_instr--;
if (_Py_Specialize_StoreSubscr(container, sub, next_instr) < 0) { if (_Py_Specialize_StoreSubscr(container, sub, next_instr) < 0) {
next_instr++;
goto error; goto error;
} }
DISPATCH_SAME_OPARG(); DISPATCH_SAME_OPARG();
@ -3056,6 +3058,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
PyObject *name = GETITEM(names, oparg>>1); PyObject *name = GETITEM(names, oparg>>1);
next_instr--; next_instr--;
if (_Py_Specialize_LoadGlobal(GLOBALS(), BUILTINS(), next_instr, name) < 0) { if (_Py_Specialize_LoadGlobal(GLOBALS(), BUILTINS(), next_instr, name) < 0) {
next_instr++;
goto error; goto error;
} }
DISPATCH_SAME_OPARG(); DISPATCH_SAME_OPARG();
@ -3481,6 +3484,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
PyObject *name = GETITEM(names, oparg); PyObject *name = GETITEM(names, oparg);
next_instr--; next_instr--;
if (_Py_Specialize_LoadAttr(owner, next_instr, name) < 0) { if (_Py_Specialize_LoadAttr(owner, next_instr, name) < 0) {
next_instr++;
goto error; goto error;
} }
DISPATCH_SAME_OPARG(); DISPATCH_SAME_OPARG();
@ -3590,6 +3594,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
PyObject *name = GETITEM(names, oparg); PyObject *name = GETITEM(names, oparg);
next_instr--; next_instr--;
if (_Py_Specialize_StoreAttr(owner, next_instr, name) < 0) { if (_Py_Specialize_StoreAttr(owner, next_instr, name) < 0) {
next_instr++;
goto error; goto error;
} }
DISPATCH_SAME_OPARG(); DISPATCH_SAME_OPARG();
@ -4527,6 +4532,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
PyObject *name = GETITEM(names, oparg); PyObject *name = GETITEM(names, oparg);
next_instr--; next_instr--;
if (_Py_Specialize_LoadMethod(owner, next_instr, name) < 0) { if (_Py_Specialize_LoadMethod(owner, next_instr, name) < 0) {
next_instr++;
goto error; goto error;
} }
DISPATCH_SAME_OPARG(); DISPATCH_SAME_OPARG();
@ -4801,6 +4807,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
int err = _Py_Specialize_Precall(callable, next_instr, nargs, int err = _Py_Specialize_Precall(callable, next_instr, nargs,
call_shape.kwnames, oparg); call_shape.kwnames, oparg);
if (err < 0) { if (err < 0) {
next_instr++;
goto error; goto error;
} }
DISPATCH_SAME_OPARG(); DISPATCH_SAME_OPARG();
@ -4822,6 +4829,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
int err = _Py_Specialize_Call(callable, next_instr, nargs, int err = _Py_Specialize_Call(callable, next_instr, nargs,
call_shape.kwnames); call_shape.kwnames);
if (err < 0) { if (err < 0) {
next_instr++;
goto error; goto error;
} }
DISPATCH_SAME_OPARG(); DISPATCH_SAME_OPARG();
@ -5184,9 +5192,6 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
PyObject *list = SECOND(); PyObject *list = SECOND();
DEOPT_IF(!PyList_Check(list), PRECALL); DEOPT_IF(!PyList_Check(list), PRECALL);
STAT_INC(PRECALL, hit); STAT_INC(PRECALL, hit);
// PRECALL + CALL + POP_TOP
JUMPBY(INLINE_CACHE_ENTRIES_PRECALL + 1 + INLINE_CACHE_ENTRIES_CALL + 1);
assert(_Py_OPCODE(next_instr[-1]) == POP_TOP);
PyObject *arg = POP(); PyObject *arg = POP();
if (_PyList_AppendTakeRef((PyListObject *)list, arg) < 0) { if (_PyList_AppendTakeRef((PyListObject *)list, arg) < 0) {
goto error; goto error;
@ -5194,6 +5199,9 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
STACK_SHRINK(2); STACK_SHRINK(2);
Py_DECREF(list); Py_DECREF(list);
Py_DECREF(callable); Py_DECREF(callable);
// PRECALL + CALL + POP_TOP
JUMPBY(INLINE_CACHE_ENTRIES_PRECALL + 1 + INLINE_CACHE_ENTRIES_CALL + 1);
assert(_Py_OPCODE(next_instr[-1]) == POP_TOP);
DISPATCH(); DISPATCH();
} }