Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions Objects/dictobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -3381,19 +3381,18 @@ dict_dealloc(PyObject *self)


static PyObject *
dict_repr_lock_held(PyObject *self)
anydict_repr_impl(PyObject *self)
{
PyDictObject *mp = (PyDictObject *)self;
PyObject *key = NULL, *value = NULL;
ASSERT_DICT_LOCKED(mp);

int res = Py_ReprEnter((PyObject *)mp);
int res = Py_ReprEnter(self);
if (res != 0) {
return (res > 0 ? PyUnicode_FromString("{...}") : NULL);
}

if (mp->ma_used == 0) {
Py_ReprLeave((PyObject *)mp);
Py_ReprLeave(self);
return PyUnicode_FromString("{}");
}

Expand All @@ -3412,7 +3411,7 @@ dict_repr_lock_held(PyObject *self)
Note that repr may mutate the dict. */
Py_ssize_t i = 0;
int first = 1;
while (_PyDict_Next((PyObject *)mp, &i, &key, &value, NULL)) {
while (_PyDict_Next(self, &i, &key, &value, NULL)) {
// Prevent repr from deleting key or value during key format.
Py_INCREF(key);
Py_INCREF(value);
Expand Down Expand Up @@ -3454,18 +3453,25 @@ dict_repr_lock_held(PyObject *self)
goto error;
}

Py_ReprLeave((PyObject *)mp);
Py_ReprLeave(self);

return PyUnicodeWriter_Finish(writer);

error:
Py_ReprLeave((PyObject *)mp);
Py_ReprLeave(self);
PyUnicodeWriter_Discard(writer);
Py_XDECREF(key);
Py_XDECREF(value);
return NULL;
}

static PyObject *
dict_repr_lock_held(PyObject *self)
{
ASSERT_DICT_LOCKED((PyDictObject *)self);
return anydict_repr_impl(self);
}

static PyObject *
dict_repr(PyObject *self)
{
Expand Down Expand Up @@ -7856,7 +7862,7 @@ static PyMethodDef frozendict_methods[] = {
static PyObject *
frozendict_repr(PyObject *self)
{
PyObject *repr = dict_repr(self);
PyObject *repr = anydict_repr_impl(self);
if (repr == NULL) {
return NULL;
}
Expand Down
Loading