mirror of
https://github.com/python/cpython.git
synced 2025-12-08 06:10:17 +00:00
gh-142218: Fix split table dictionary crash (gh-142229)
This fixes a regression introduced in gh-140558. The interpreter would crash if we inserted a non `str` key into a split table that matches an existing key.
This commit is contained in:
parent
618dc36714
commit
547d8daf78
3 changed files with 17 additions and 3 deletions
|
|
@ -1914,10 +1914,14 @@ insertdict(PyInterpreterState *interp, PyDictObject *mp,
|
|||
if (old_value != value) {
|
||||
_PyDict_NotifyEvent(interp, PyDict_EVENT_MODIFIED, mp, key, value);
|
||||
assert(old_value != NULL);
|
||||
assert(!_PyDict_HasSplitTable(mp));
|
||||
if (DK_IS_UNICODE(mp->ma_keys)) {
|
||||
PyDictUnicodeEntry *ep = &DK_UNICODE_ENTRIES(mp->ma_keys)[ix];
|
||||
STORE_VALUE(ep, value);
|
||||
if (_PyDict_HasSplitTable(mp)) {
|
||||
STORE_SPLIT_VALUE(mp, ix, value);
|
||||
}
|
||||
else {
|
||||
PyDictUnicodeEntry *ep = &DK_UNICODE_ENTRIES(mp->ma_keys)[ix];
|
||||
STORE_VALUE(ep, value);
|
||||
}
|
||||
}
|
||||
else {
|
||||
PyDictKeyEntry *ep = &DK_ENTRIES(mp->ma_keys)[ix];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue