bpo-36791: Safer detection of integer overflow in sum(). (GH-13080)

miss-islington · serhiy-storchaka · web-flow · commit b7e483b6d070 · 2019-05-12T02:37:15.000-07:00
(cherry picked from commit 2950073) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
@@ -2374,9 +2374,11 @@ builtin_sum_impl(PyObject *module, PyObject *iterable, PyObject *start)
             }
             if (PyLong_CheckExact(item)) {
                 long b = PyLong_AsLongAndOverflow(item, &overflow);
-                long x = i_result + b;
-                if (overflow == 0 && ((x^i_result) >= 0 || (x^b) >= 0)) {
-                    i_result = x;
+                if (overflow == 0 &&
+                    (i_result >= 0 ? (b <= LONG_MAX - i_result)
+                                   : (b >= LONG_MIN - i_result)))
+                {
+                    i_result += b;
                     Py_DECREF(item);
                     continue;
                 }
