cpython: ba766323b53a (original) (raw)

Mercurial > cpython

changeset 84509:ba766323b53a

Issue #18408: Fix PyDict_New() to handle correctly new_keys_object() failure (MemoryError). [#18408]

Victor Stinner victor.stinner@gmail.com
date	Mon, 08 Jul 2013 22:19:20 +0200
parents	111c2a070f28
children	68887e177dd4
files	Objects/dictobject.c
diffstat	1 files changed, 5 insertions(+), 1 deletions(-)[+] [-] Objects/dictobject.c 6

line wrap: on

line diff

--- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -389,6 +389,7 @@ static PyObject * new_dict(PyDictKeysObject *keys, PyObject **values) { PyDictObject *mp;

assert(keys != NULL); if (numfree) { mp = free_list[--numfree]; assert (mp != NULL);

@@ -431,7 +432,10 @@ new_dict_with_shared_keys(PyDictKeysObje PyObject * PyDict_New(void) {

return new_dict(new_keys_object(PyDict_MINSIZE_COMBINED), NULL);

PyDictKeysObject *keys = new_keys_object(PyDict_MINSIZE_COMBINED);
if (keys == NULL)
```
   return NULL;[](#l1.18)
```
return new_dict(keys, NULL);

} /*