From: Zackery Spytz <zspytz@gmail.com>
Date: Wed, 20 Mar 2019 09:16:25 +0000 (-0600)
Subject: bpo-36374: Fix a possible null pointer dereference (GH-12449)
X-Git-Tag: v3.8.0a3~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b4a1b1e23d4a7cb18ad26f405bdc741af69f342;p=thirdparty%2FPython%2Fcpython.git

bpo-36374: Fix a possible null pointer dereference (GH-12449)



https://bugs.python.org/issue36374
---

diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-03-19-15-46-42.bpo-36374.EWKMZE.rst b/Misc/NEWS.d/next/Core and Builtins/2019-03-19-15-46-42.bpo-36374.EWKMZE.rst
new file mode 100644
index 000000000000..2eac30136854
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2019-03-19-15-46-42.bpo-36374.EWKMZE.rst	
@@ -0,0 +1,2 @@
+Fix a possible null pointer dereference in ``merge_consts_recursive()``.
+Patch by Zackery Spytz.
diff --git a/Python/compile.c b/Python/compile.c
index 697833752bb0..3656a7e00efd 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -1210,7 +1210,7 @@ merge_consts_recursive(struct compiler *c, PyObject *o)
     PyObject *t = PyDict_SetDefault(c->c_const_cache, key, key);
     if (t != key) {
         // o is registered in c_const_cache.  Just use it.
-        Py_INCREF(t);
+        Py_XINCREF(t);
         Py_DECREF(key);
         return t;
     }