Commit 4ebf6d7c authored by Christian Heimes's avatar Christian Heimes

Issue #18560: Fix potential NULL pointer dereference in sum()

parents f446d217 704e2d37
...@@ -10,6 +10,8 @@ What's New in Python 3.4.0 Alpha 1? ...@@ -10,6 +10,8 @@ What's New in Python 3.4.0 Alpha 1?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #18560: Fix potential NULL pointer dereference in sum().
- Issue #18520: Add a new PyStructSequence_InitType2() function, same than - Issue #18520: Add a new PyStructSequence_InitType2() function, same than
PyStructSequence_InitType() except that it has a return value (0 on success, PyStructSequence_InitType() except that it has a return value (0 on success,
-1 on error). -1 on error).
......
...@@ -2030,6 +2030,11 @@ builtin_sum(PyObject *self, PyObject *args) ...@@ -2030,6 +2030,11 @@ builtin_sum(PyObject *self, PyObject *args)
} }
/* Either overflowed or is not an int. Restore real objects and process normally */ /* Either overflowed or is not an int. Restore real objects and process normally */
result = PyLong_FromLong(i_result); result = PyLong_FromLong(i_result);
if (result == NULL) {
Py_DECREF(item);
Py_DECREF(iter);
return NULL;
}
temp = PyNumber_Add(result, item); temp = PyNumber_Add(result, item);
Py_DECREF(result); Py_DECREF(result);
Py_DECREF(item); Py_DECREF(item);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment