bpo-27145: small_ints[x] could be returned in long_add and long_sub (GH-15716)
diff --git a/Objects/longobject.c b/Objects/longobject.c
index 294308e..f056797 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -3206,7 +3206,7 @@
if (sign < 0) {
Py_SIZE(z) = -Py_SIZE(z);
}
- return long_normalize(z);
+ return maybe_small_long(long_normalize(z));
}
static PyObject *
@@ -3254,13 +3254,15 @@
return PyLong_FromLong(MEDIUM_VALUE(a) - MEDIUM_VALUE(b));
}
if (Py_SIZE(a) < 0) {
- if (Py_SIZE(b) < 0)
- z = x_sub(a, b);
- else
+ if (Py_SIZE(b) < 0) {
+ z = x_sub(b, a);
+ }
+ else {
z = x_add(a, b);
- if (z != NULL) {
- assert(Py_SIZE(z) == 0 || Py_REFCNT(z) == 1);
- Py_SIZE(z) = -(Py_SIZE(z));
+ if (z != NULL) {
+ assert(Py_SIZE(z) == 0 || Py_REFCNT(z) == 1);
+ Py_SIZE(z) = -(Py_SIZE(z));
+ }
}
}
else {