From 9b4a1b1e23d4a7cb18ad26f405bdc741af69f342 Mon Sep 17 00:00:00 2001 From: Zackery Spytz Date: Wed, 20 Mar 2019 03:16:25 -0600 Subject: bpo-36374: Fix a possible null pointer dereference (GH-12449) https://bugs.python.org/issue36374 --- .../next/Core and Builtins/2019-03-19-15-46-42.bpo-36374.EWKMZE.rst | 2 ++ Python/compile.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2019-03-19-15-46-42.bpo-36374.EWKMZE.rst 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 0000000..2eac301 --- /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 6978337..3656a7e 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; } -- cgit v0.12