From: Zackery Spytz <zspytz@gmail.com>
Date: Sun, 24 Mar 2019 02:23:29 +0000 (-0600)
Subject: bpo-36412: fix a possible crash in dictobject.c's new_dict() (GH-12519)
X-Git-Tag: v3.8.0a3~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d07c1ee1d2d475b74816117981d6ec752c26c23;p=python

bpo-36412: fix a possible crash in dictobject.c's new_dict() (GH-12519)
---

diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-03-23-19-51-09.bpo-36412.C7acGn.rst b/Misc/NEWS.d/next/Core and Builtins/2019-03-23-19-51-09.bpo-36412.C7acGn.rst
new file mode 100644
index 0000000000..0146988151
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2019-03-23-19-51-09.bpo-36412.C7acGn.rst	
@@ -0,0 +1 @@
+Fix a possible crash when creating a new dictionary.
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 524ff67837..e2603e190b 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -604,7 +604,9 @@ new_dict(PyDictKeysObject *keys, PyObject **values)
         mp = PyObject_GC_New(PyDictObject, &PyDict_Type);
         if (mp == NULL) {
             dictkeys_decref(keys);
-            free_values(values);
+            if (values != empty_values) {
+                free_values(values);
+            }
             return NULL;
         }
     }