ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 09:05:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Issue #14417: Mutating a dict during lookup now restarts the lookup instead of raising a RuntimeError (undoes issue #14205).

Browse source
This commit is contained in:
Antoine Pitrou 2012-05-13 20:48:01 +02:00
parent 7feb9f4225
commit 9a2349030a
5 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Objects/dictobject.c
View file

@ -439,12 +439,15 @@ lookdict(PyDictObject *mp, PyObject *key,
register size_t i;
register size_t perturb;
register PyDictKeyEntry *freeslot;
register size_t mask = DK_MASK(mp->ma_keys);
PyDictKeyEntry *ep0 = &mp->ma_keys->dk_entries[0];
register size_t mask;
PyDictKeyEntry *ep0;
register PyDictKeyEntry *ep;
register int cmp;
PyObject *startkey;
top:
mask = DK_MASK(mp->ma_keys);
ep0 = &mp->ma_keys->dk_entries[0];
i = (size_t)hash & mask;
ep = &ep0[i];
if (ep->me_key == NULL || ep->me_key == key) {
@ -468,9 +471,8 @@ lookdict(PyDictObject *mp, PyObject *key,
}
}
else {
PyErr_SetString(PyExc_RuntimeError,
"dictionary changed size during lookup");
return NULL;
/* The dict was mutated, restart */
goto top;
}
}
freeslot = NULL;
@ -510,9 +512,8 @@ lookdict(PyDictObject *mp, PyObject *key,
}
}
else {
PyErr_SetString(PyExc_RuntimeError,
"dictionary changed size during lookup");
return NULL;
/* The dict was mutated, restart */
goto top;
}
}
else if (ep->me_key == dummy && freeslot == NULL)