mirror of
https://github.com/python/cpython.git
synced 2025-11-01 06:01:29 +00:00
gh-117139: Fix an incorrect borrow in bytecodes.c (#122318)
`_PyDict_SetItem_Take2` steals both the key (i.e., `sub`) and the value.
This commit is contained in:
parent
013a092975
commit
674a50ef2f
3 changed files with 14 additions and 11 deletions
9
Python/generated_cases.c.h
generated
9
Python/generated_cases.c.h
generated
|
|
@ -6625,16 +6625,17 @@
|
|||
static_assert(INLINE_CACHE_ENTRIES_STORE_SUBSCR == 1, "incorrect cache size");
|
||||
_PyStackRef value;
|
||||
_PyStackRef dict_st;
|
||||
_PyStackRef sub_st;
|
||||
_PyStackRef sub;
|
||||
/* Skip 1 cache entry */
|
||||
sub_st = stack_pointer[-1];
|
||||
sub = stack_pointer[-1];
|
||||
dict_st = stack_pointer[-2];
|
||||
value = stack_pointer[-3];
|
||||
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
|
||||
PyObject *dict = PyStackRef_AsPyObjectBorrow(dict_st);
|
||||
DEOPT_IF(!PyDict_CheckExact(dict), STORE_SUBSCR);
|
||||
STAT_INC(STORE_SUBSCR, hit);
|
||||
int err = _PyDict_SetItem_Take2((PyDictObject *)dict, sub, PyStackRef_AsPyObjectSteal(value));
|
||||
int err = _PyDict_SetItem_Take2((PyDictObject *)dict,
|
||||
PyStackRef_AsPyObjectSteal(sub),
|
||||
PyStackRef_AsPyObjectSteal(value));
|
||||
PyStackRef_CLOSE(dict_st);
|
||||
if (err) goto pop_3_error;
|
||||
stack_pointer += -3;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue