diff options
| author | Zackery Spytz <zspytz@gmail.com> | 2019-03-20 03:16:25 -0600 |
|---|---|---|
| committer | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-03-20 02:16:25 -0700 |
| commit | 9b4a1b1e23d4a7cb18ad26f405bdc741af69f342 (patch) | |
| tree | 9f48b672192a1e4578f12e80b77d948cf237d9c9 | |
| parent | fa1537684869186da7938e4330361bf02363bac8 (diff) | |
| download | cpython-git-9b4a1b1e23d4a7cb18ad26f405bdc741af69f342.tar.gz | |
bpo-36374: Fix a possible null pointer dereference (GH-12449)
https://bugs.python.org/issue36374
| -rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2019-03-19-15-46-42.bpo-36374.EWKMZE.rst | 2 | ||||
| -rw-r--r-- | Python/compile.c | 2 |
2 files changed, 3 insertions, 1 deletions
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 0000000000..2eac301368 --- /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 697833752b..3656a7e00e 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; } |