summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2013-07-26 20:50:01 (GMT)
committerChristian Heimes <christian@cheimes.de>2013-07-26 20:50:01 (GMT)
commit4ebf6d7c3c2a0b04dd815c0b042294e36d644954 (patch)
treeae06c91790fdf002dd5f6e64d5e36c5c6a2007f8
parentf446d217089e61778c794023f38932e2c2798234 (diff)
parent704e2d374f88bca83339b95d559b0abce12dc6bd (diff)
downloadcpython-4ebf6d7c3c2a0b04dd815c0b042294e36d644954.zip
cpython-4ebf6d7c3c2a0b04dd815c0b042294e36d644954.tar.gz
cpython-4ebf6d7c3c2a0b04dd815c0b042294e36d644954.tar.bz2
Issue #18560: Fix potential NULL pointer dereference in sum()
-rw-r--r--Misc/NEWS2
-rw-r--r--Python/bltinmodule.c5
2 files changed, 7 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 2f387e7..10ea9f7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@ What's New in Python 3.4.0 Alpha 1?
Core and Builtins
-----------------
+- Issue #18560: Fix potential NULL pointer dereference in sum().
+
- Issue #18520: Add a new PyStructSequence_InitType2() function, same than
PyStructSequence_InitType() except that it has a return value (0 on success,
-1 on error).
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 06d71f7..fb3abae 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -2030,6 +2030,11 @@ builtin_sum(PyObject *self, PyObject *args)
}
/* Either overflowed or is not an int. Restore real objects and process normally */
result = PyLong_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);