From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 3 Jun 2016 21:06:45 +0000 (+0300)
Subject: Issue #27073: Removed redundant checks in long_add and long_sub.
X-Git-Tag: v3.6.0a2~159
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e63e5d60ee9173d1f0205e75f4cbdba67c5d66d4;p=thirdparty%2FPython%2Fcpython.git

Issue #27073: Removed redundant checks in long_add and long_sub.
Patch by Oren Milman.
---

diff --git a/Objects/longobject.c b/Objects/longobject.c
index 14d2974e92b0..473254508fb8 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -3022,8 +3022,14 @@ long_add(PyLongObject *a, PyLongObject *b)
     if (Py_SIZE(a) < 0) {
         if (Py_SIZE(b) < 0) {
             z = x_add(a, b);
-            if (z != NULL && Py_SIZE(z) != 0)
+            if (z != NULL) {
+                /* x_add received at least one multiple-digit int,
+                   and thus z must be a multiple-digit int.
+                   That also means z is not an element of
+                   small_ints, so negating it in-place is safe. */
+                assert(Py_REFCNT(z) == 1);
                 Py_SIZE(z) = -(Py_SIZE(z));
+            }
         }
         else
             z = x_sub(b, a);
@@ -3054,8 +3060,10 @@ long_sub(PyLongObject *a, PyLongObject *b)
             z = x_sub(a, b);
         else
             z = x_add(a, b);
-        if (z != NULL && Py_SIZE(z) != 0)
+        if (z != NULL) {
+            assert(Py_SIZE(z) == 0 || Py_REFCNT(z) == 1);
             Py_SIZE(z) = -(Py_SIZE(z));
+        }
     }
     else {
         if (Py_SIZE(b) < 0)