mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 08:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Issue #25449: Fixed a crash and leaking NULL in repr() of OrderedDict that

Browse source 
was mutated by direct calls of dict methods.
This commit is contained in:
Serhiy Storchaka 2015-11-04 22:33:07 +02:00
parent b45b7b2137
commit 710cd34bdb
3 changed files with 70 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Objects/odictobject.c
View file

@ -1462,7 +1462,6 @@ odict_repr(PyODictObject *self)
{
int i;
_Py_IDENTIFIER(items);
Py_ssize_t count = -1;
PyObject *pieces = NULL, *result = NULL;
const char *classname;
@ -1481,6 +1480,7 @@ odict_repr(PyODictObject *self)
}
if (PyODict_CheckExact(self)) {
Py_ssize_t count = 0;
_ODictNode *node;
pieces = PyList_New(PyODict_SIZE(self));
if (pieces == NULL)
@ -1499,8 +1499,19 @@ odict_repr(PyODictObject *self)
if (pair == NULL)
goto Done;
PyList_SET_ITEM(pieces, ++count, pair); /* steals reference */
if (count < PyList_GET_SIZE(pieces))
PyList_SET_ITEM(pieces, count, pair); /* steals reference */
else {
if (PyList_Append(pieces, pair) < 0) {
Py_DECREF(pair);
goto Done;
}
Py_DECREF(pair);
}
count++;
}
if (count < PyList_GET_SIZE(pieces))
PyList_GET_SIZE(pieces) = count;
}
else {
PyObject *items = _PyObject_CallMethodIdObjArgs((PyObject *)self,