mirror of
https://github.com/python/cpython.git
synced 2026-04-27 06:10:59 +00:00
gh-148973: fix segfault on mismatch between consts size and oparg in compiler (#148974)
This commit is contained in:
parent
db0ee44b93
commit
c650b51c32
5 changed files with 95 additions and 6 deletions
|
|
@ -1658,6 +1658,7 @@ _PyCompile_CodeGen(PyObject *ast, PyObject *filename, PyCompilerFlags *pflags,
|
|||
{
|
||||
PyObject *res = NULL;
|
||||
PyObject *metadata = NULL;
|
||||
PyObject *consts_list = NULL;
|
||||
|
||||
if (!PyAST_Check(ast)) {
|
||||
PyErr_SetString(PyExc_TypeError, "expected an AST");
|
||||
|
|
@ -1712,12 +1713,23 @@ _PyCompile_CodeGen(PyObject *ast, PyObject *filename, PyCompilerFlags *pflags,
|
|||
}
|
||||
|
||||
if (_PyInstructionSequence_ApplyLabelMap(_PyCompile_InstrSequence(c)) < 0) {
|
||||
return NULL;
|
||||
goto finally;
|
||||
}
|
||||
|
||||
/* After AddReturnAtEnd: co_consts indices match the final instruction stream. */
|
||||
consts_list = consts_dict_keys_inorder(umd->u_consts);
|
||||
if (consts_list == NULL) {
|
||||
goto finally;
|
||||
}
|
||||
if (PyDict_SetItemString(metadata, "consts", consts_list) < 0) {
|
||||
goto finally;
|
||||
}
|
||||
|
||||
/* Allocate a copy of the instruction sequence on the heap */
|
||||
res = _PyTuple_FromPair((PyObject *)_PyCompile_InstrSequence(c), metadata);
|
||||
|
||||
finally:
|
||||
Py_XDECREF(consts_list);
|
||||
Py_XDECREF(metadata);
|
||||
_PyCompile_ExitScope(c);
|
||||
compiler_free(c);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue