Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions Lib/test/test_builtin.py
Original file line number Diff line number Diff line change
Expand Up @@ -2080,6 +2080,31 @@ def __getitem__(self, index):
self.assertComplexesAreIdentical(sum([1.0, complex(1, -0.0)]),
complex(2, -0.0))

def test_sum_float_subclass(self):
# gh-151060: the C fast-sum loop must not free a float subclass with
# the exact-float deallocator. A generator keeps each item's only
# reference in sum(), so the specialized DECREF runs the deallocator.
class F(float):
count = 0
def __del__(self):
F.count += 1

self.assertEqual(sum((F(i) for i in range(5)), 1j), complex(10, 1))
self.assertEqual(F.count, 5)

def test_sum_int_subclass(self):
# gh-151060: likewise, the float and complex fast-sum loops must not
# free an int subclass with the exact-int deallocator.
class I(int):
count = 0
def __del__(self):
I.count += 1

self.assertEqual(sum((I(i) for i in range(5)), 1.0), 11.0)
self.assertEqual(I.count, 5)
self.assertEqual(sum((I(i) for i in range(5)), 1j), complex(10, 1))
self.assertEqual(I.count, 10)

@requires_IEEE_754
@unittest.skipIf(HAVE_DOUBLE_ROUNDING,
"sum accuracy not guaranteed on machines with double rounding")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix a crash or memory corruption in :func:`sum` when summing a
:class:`float` subclass instance into a complex running total.
14 changes: 7 additions & 7 deletions Python/bltinmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -2901,15 +2901,15 @@ builtin_sum_impl(PyObject *module, PyObject *iterable, PyObject *start)
_Py_DECREF_SPECIALIZED(item, _PyFloat_ExactDealloc);
continue;
}
if (PyLong_Check(item)) {
if (PyLong_CheckExact(item)) {
double value = PyLong_AsDouble(item);
if (value != -1.0 || !PyErr_Occurred()) {
re_sum = cs_add(re_sum, value);
Py_DECREF(item);
_Py_DECREF_SPECIALIZED(item, _PyLong_ExactDealloc);
continue;
}
else {
Py_DECREF(item);
_Py_DECREF_SPECIALIZED(item, _PyLong_ExactDealloc);
Py_DECREF(iter);
return NULL;
}
Expand Down Expand Up @@ -2953,20 +2953,20 @@ builtin_sum_impl(PyObject *module, PyObject *iterable, PyObject *start)
Py_DECREF(item);
continue;
}
if (PyLong_Check(item)) {
if (PyLong_CheckExact(item)) {
double value = PyLong_AsDouble(item);
if (value != -1.0 || !PyErr_Occurred()) {
re_sum = cs_add(re_sum, value);
Py_DECREF(item);
_Py_DECREF_SPECIALIZED(item, _PyLong_ExactDealloc);
continue;
}
else {
Py_DECREF(item);
_Py_DECREF_SPECIALIZED(item, _PyLong_ExactDealloc);
Py_DECREF(iter);
return NULL;
}
}
if (PyFloat_Check(item)) {
if (PyFloat_CheckExact(item)) {
double value = PyFloat_AS_DOUBLE(item);
re_sum = cs_add(re_sum, value);
_Py_DECREF_SPECIALIZED(item, _PyFloat_ExactDealloc);
Expand Down
Loading