[Python-checkins] cpython (merge 3.3 -> default): Issue #18560: Fix potential NULL pointer dereference in sum()
christian.heimes
python-checkins at python.org
Fri Jul 26 22:50:12 CEST 2013
http://hg.python.org/cpython/rev/a5d9e2f3f6c7
changeset: 84847:a5d9e2f3f6c7
parent: 84845:b33f81974516
parent: 84846:de7e4fd634fb
user: Christian Heimes <christian at cheimes.de>
date: Fri Jul 26 22:50:01 2013 +0200
summary:
Issue #18560: Fix potential NULL pointer dereference in sum()
files:
Misc/NEWS | 2 ++
Python/bltinmodule.c | 5 +++++
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@
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
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -2030,6 +2030,11 @@
}
/* 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);
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list