From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 24 Aug 2018 05:28:39 +0000 (-0700)
Subject: [2.7] Issue GH-18560: Fix potential NULL pointer dereference in sum(). (GH-8892)
X-Git-Tag: v2.7.16rc1~169
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67dafd5c202cd529e209bf3f35e022ce766709eb;p=thirdparty%2FPython%2Fcpython.git

[2.7] Issue GH-18560: Fix potential NULL pointer dereference in sum(). (GH-8892)

(cherry picked from commit 704e2d374f88bca83339b95d559b0abce12dc6bd)

Co-authored-by: Christian Heimes <christian@cheimes.de>
---

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 000000000000..4c1f06002228
--- /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 21f6e66d82e1..4b819da8b399 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);