commit c9b7f51ec203ea5148014741d1fefe1a0faeefa1
author Victor Stinner <victor.stinner@gmail.com> Mon Jul 08 22:19:20 2013 +0200
committer Victor Stinner <victor.stinner@gmail.com> Mon Jul 08 22:19:20 2013 +0200
tree c6ef51aa76de8671b16a4d0303f0da37cd228203
parent 5d1866c78a4caf9825a0ce90863c19f65279da86

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

Objects/dictobject.c

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 250c890..9d8696a 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -389,6 +389,7 @@
 new_dict(PyDictKeysObject *keys, PyObject **values)
 {
     PyDictObject *mp;
+    assert(keys != NULL);
     if (numfree) {
         mp = free_list[--numfree];
         assert (mp != NULL);
@@ -431,7 +432,10 @@
 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;
+    return new_dict(keys, NULL);
 }
 
 /*