1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gh-126835: Fix reference leak in Python/flowgrapc.::optimize_if_const_subscr (#129634)

Browse Source
This commit is contained in:
Yan Yanchii 2025-02-04 11:38:06 +01:00 committed by GitHub
parent 0664c1af9b
commit d3c54f3788
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Python/flowgraph.c
View File

@ -1500,13 +1500,15 @@ optimize_if_const_subscr(basicblock *bb, int n, PyObject *consts, PyObject *cons
if (!find_load_const_pair(bb, n-1, &arg, &idx)) { if (!find_load_const_pair(bb, n-1, &arg, &idx)) {
return SUCCESS; return SUCCESS;
} }
PyObject *o, *key; PyObject *o = NULL, *key = NULL;
if ((o = get_const_value(arg->i_opcode, arg->i_oparg, consts)) == NULL if ((o = get_const_value(arg->i_opcode, arg->i_oparg, consts)) == NULL
|| (key = get_const_value(idx->i_opcode, idx->i_oparg, consts)) == NULL) || (key = get_const_value(idx->i_opcode, idx->i_oparg, consts)) == NULL)
{ {
return ERROR; goto error;
} }
PyObject *newconst = PyObject_GetItem(o, key); PyObject *newconst = PyObject_GetItem(o, key);
Py_DECREF(o);
Py_DECREF(key);
if (newconst == NULL) { if (newconst == NULL) {
if (PyErr_ExceptionMatches(PyExc_KeyboardInterrupt)) { if (PyErr_ExceptionMatches(PyExc_KeyboardInterrupt)) {
return ERROR; return ERROR;
@ -1520,6 +1522,10 @@ optimize_if_const_subscr(basicblock *bb, int n, PyObject *consts, PyObject *cons
INSTR_SET_OP0(arg, NOP); INSTR_SET_OP0(arg, NOP);
INSTR_SET_OP0(idx, NOP); INSTR_SET_OP0(idx, NOP);
return SUCCESS; return SUCCESS;
error:
Py_XDECREF(o);
Py_XDECREF(key);
return ERROR;
} }
#define VISITED (-1) #define VISITED (-1)