Don't overflow shift in PyLong_FromLong.

python · Aug 23, 2021 · 649c311 · 649c311
1 parent 1f2d47c
commit 649c311
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Objects/longobject.c b/Objects/longobject.c
@@ -273,8 +273,9 @@ PyLong_FromLong(long ival)
     if (!(abs_ival >> PyLong_SHIFT)) {
         return _PyLong_FromMedium((sdigit)ival);
     }
-    /* Must be at least two digits */
-    unsigned long t = abs_ival >> (PyLong_SHIFT *2);
+    /* Must be at least two digits.
+     * Do shift in two steps to avoid undefined behavior. */
+    unsigned long t = (abs_ival >> PyLong_SHIFT) >> PyLong_SHIFT;
     Py_ssize_t ndigits = 2;
     while (t) {
         ++ndigits;