A test and a const

zooba · zooba · commit bc9e48c5781b · 2024-02-02T17:00:31.000Z
diff --git a/Include/cpython/longobject.h b/Include/cpython/longobject.h
@@ -29,9 +29,9 @@ PyAPI_FUNC(int) PyLong_CopyBits(PyObject* v, void* buffer, size_t n_bytes,
    endianness is -1 for native endian, 0 for big endian or 1 for little.
 
    Returns the int object, or NULL with an exception set. */
-PyAPI_FUNC(PyObject*) PyLong_FromBits(void* buffer, size_t n_bytes,
+PyAPI_FUNC(PyObject*) PyLong_FromBits(const void* buffer, size_t n_bytes,
     int endianness);
-PyAPI_FUNC(PyObject*) PyLong_FromUnsignedBits(void* buffer, size_t n_bytes,
+PyAPI_FUNC(PyObject*) PyLong_FromUnsignedBits(const void* buffer, size_t n_bytes,
     int endianness);
 
 PyAPI_FUNC(int) PyUnstable_Long_IsCompact(const PyLongObject* op);
diff --git a/Lib/test/test_capi/test_long.py b/Lib/test/test_capi/test_long.py
@@ -461,7 +461,7 @@ def test_long_copybits(self):
         for v, expect_be, expect_n in [
             (0,         b'\x00',                1),
             (0,         b'\x00' * 2,            2),
-            (0,         b'\x00' * 8,            8),
+            (0,         b'\x00' * 8,            min(8, SZ)),
             (1,         b'\x01',                1),
             (1,         b'\x00' * 10 + b'\x01', min(11, SZ)),
             (42,        b'\x2a',                1),
diff --git a/Objects/longobject.c b/Objects/longobject.c
@@ -1096,7 +1096,7 @@ PyLong_CopyBits(PyObject* vv, void* buffer, size_t n, int endianness)
         return -1;
     }
 
-    if ((int)n != n || (int)n < 0) {
+    if ((size_t)(int)n != n || (int)n < 0) {
         PyErr_SetString(PyExc_SystemError, "n_bytes too big to copy");
         return -1;
     }
@@ -1202,7 +1202,7 @@ PyLong_CopyBits(PyObject* vv, void* buffer, size_t n, int endianness)
          * the sign and it cancels out. */
         size_t n_needed = (nb / 8) + 1;
         res = (int)n_needed;
-        if (res != n_needed) {
+        if ((size_t)res != n_needed) {
             PyErr_SetString(PyExc_OverflowError,
                 "value too large to convert");
             res = -1;
@@ -1240,7 +1240,7 @@ PyLong_FromBits(const void* buffer, size_t n, int endianness)
 
 
 PyObject *
-PyLong_FromUnsignedBits(void* buffer, size_t n, int endianness)
+PyLong_FromUnsignedBits(const void* buffer, size_t n, int endianness)
 {
     if (!buffer) {
         PyErr_BadInternalCall();
