From 67dafd5c202cd529e209bf3f35e022ce766709eb Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Thu, 23 Aug 2018 22:28:39 -0700 Subject: [2.7] Issue GH-18560: Fix potential NULL pointer dereference in sum(). (GH-8892) (cherry picked from commit 704e2d374f88bca83339b95d559b0abce12dc6bd) Co-authored-by: Christian Heimes --- .../next/Core and Builtins/2018-08-23-21-32-27.bpo-18560.5q_c1C.rst | 1 + Python/bltinmodule.c | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2018-08-23-21-32-27.bpo-18560.5q_c1C.rst diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-08-23-21-32-27.bpo-18560.5q_c1C.rst b/Misc/NEWS.d/next/Core and Builtins/2018-08-23-21-32-27.bpo-18560.5q_c1C.rst new file mode 100644 index 0000000..4c1f060 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2018-08-23-21-32-27.bpo-18560.5q_c1C.rst @@ -0,0 +1 @@ +Fix potential NULL pointer dereference in sum(). diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 21f6e66..4b819da 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -2363,6 +2363,11 @@ builtin_sum(PyObject *self, PyObject *args) } /* Either overflowed or is not an int. Restore real objects and process normally */ result = PyInt_FromLong(i_result); + if (result == NULL) { + Py_DECREF(item); + Py_DECREF(iter); + return NULL; + } temp = PyNumber_Add(result, item); Py_DECREF(result); Py_DECREF(item); -- cgit v0.12