py/objint: Fix int.to_bytes() buffer size checks.

Fixes and improvements to `int.to_bytes()` are:
- No longer overflows if byte size is 0 (closes #13041).
- Raises OverflowError in any case where number won't fit into byte length
  (now matches CPython, previously MicroPython would return a truncated
  bytes object).
- Document that `micropython int.to_bytes()` doesn't implement the optional
  signed kwarg, but will behave as if `signed=True` when the integer is
  negative (this is the current behaviour).  Add tests for this also.

Requires changes for small ints, MPZ large ints, and "long long" large
ints.

Adds a new set of unit tests for ints between 32 and 64 bits to increase
coverage of "long long" large ints, which are otherwise untested.

Tested on unix port (64 bit small ints, MPZ long ints) and Zephyr STM32WB
board (32 bit small ints, long long large ints).

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
This commit is contained in:
Angus Gratton
2023-11-29 11:23:16 +11:00
committed by Damien George
parent d933210d96
commit 908ab1ceca
12 changed files with 302 additions and 29 deletions

View File

@@ -1,3 +1,5 @@
import sys
print((10).to_bytes(1, "little"))
print((111111).to_bytes(4, "little"))
print((100).to_bytes(10, "little"))
@@ -20,3 +22,74 @@ try:
(1).to_bytes(-1, "little")
except ValueError:
print("ValueError")
# zero byte destination should also raise an error
try:
(1).to_bytes(0, "little")
except OverflowError:
print("OverflowError")
# except for converting 0 to a zero-length byte array
print((0).to_bytes(0, "big"))
# byte length can fit the integer directly
print((0xFF).to_bytes(1, "little"))
print((0xFF).to_bytes(1, "big"))
print((0xEFF).to_bytes(2, "little"))
print((0xEFF).to_bytes(2, "big"))
print((0xCDEFF).to_bytes(3, "little"))
print((0xCDEFF).to_bytes(3, "big"))
# OverFlowError if not big enough
try:
(0x123).to_bytes(1, "big")
except OverflowError:
print("OverflowError")
try:
(0x12345).to_bytes(2, "big")
except OverflowError:
print("OverflowError")
try:
(0x1234567).to_bytes(3, "big")
except OverflowError:
print("OverflowError")
# negative representations
# MicroPython int.to_bytes() behaves as if signed=True for negative numbers
if "micropython" in repr(sys.implementation):
def to_bytes_compat(i, l, e):
return i.to_bytes(l, e)
else:
# Implement MicroPython compatible behaviour for CPython
def to_bytes_compat(i, l, e):
return i.to_bytes(l, e, signed=i < 0)
print(to_bytes_compat(-1, 1, "little"))
print(to_bytes_compat(-1, 3, "little"))
print(to_bytes_compat(-1, 1, "big"))
print(to_bytes_compat(-1, 3, "big"))
print(to_bytes_compat(-128, 1, "big"))
print(to_bytes_compat(-32768, 2, "big"))
print(to_bytes_compat(-(1 << 23), 3, "big"))
try:
print(to_bytes_compat(-129, 1, "big"))
except OverflowError:
print("OverflowError")
try:
print(to_bytes_compat(-32769, 2, "big"))
except OverflowError:
print("OverflowError")
try:
print(to_bytes_compat(-(1 << 23) - 1, 2, "big"))
except OverflowError:
print("OverflowError")

View File

@@ -0,0 +1,52 @@
import sys
# Depending on the port, the numbers in this test may be implemented as "small"
# native 64 bit ints, arbitrary precision large ints, or large integers using 64-bit
# long longs.
try:
x = int.from_bytes(b"\x6F\xAB\xCD\x12\x34\x56\x78\xFB", "big")
except OverflowError:
print("SKIP") # Port can't represent this size of integer at all
raise SystemExit
print(hex(x))
b = x.to_bytes(8, "little")
print(b)
print(x.to_bytes(8, "big"))
# padding in output
print(x.to_bytes(20, "little"))
print(x.to_bytes(20, "big"))
# check that extra zero bytes don't change the internal int value
print(int.from_bytes(b + bytes(10), "little") == x)
# can't write to a zero-length bytes object
try:
x.to_bytes(0, "little")
except OverflowError:
print("OverflowError")
# or one that it too short
try:
x.to_bytes(7, "big")
except OverflowError:
print("OverflowError")
# negative representations
# MicroPython int.to_bytes() behaves as if signed=True for negative numbers
if "micropython" in repr(sys.implementation):
def to_bytes_compat(i, l, e):
return i.to_bytes(l, e)
else:
# Implement MicroPython compatible behaviour for CPython
def to_bytes_compat(i, l, e):
return i.to_bytes(l, e, signed=i < 0)
print(to_bytes_compat(-x, 8, "little"))
print(to_bytes_compat(-x, 20, "big"))
print(to_bytes_compat(-x, 20, "little"))

View File

@@ -1,3 +1,5 @@
import sys
print((2**64).to_bytes(9, "little"))
print((2**64).to_bytes(9, "big"))
@@ -10,5 +12,51 @@ print(ib)
print(il.to_bytes(20, "little"))
print(ib.to_bytes(20, "big"))
# check padding comes out correctly
print(il.to_bytes(40, "little"))
print(ib.to_bytes(40, "big"))
# check that extra zero bytes don't change the internal int value
print(int.from_bytes(b + bytes(10), "little") == int.from_bytes(b, "little"))
# can't write to a zero-length bytes object
try:
ib.to_bytes(0, "little")
except OverflowError:
print("OverflowError")
# or one that it too short
try:
ib.to_bytes(18, "big")
except OverflowError:
print("OverflowError")
# negative representations
# MicroPython int.to_bytes() behaves as if signed=True for negative numbers
if "micropython" in repr(sys.implementation):
def to_bytes_compat(i, l, e):
return i.to_bytes(l, e)
else:
# Implement MicroPython compatible behaviour for CPython
def to_bytes_compat(i, l, e):
return i.to_bytes(l, e, signed=i < 0)
print(to_bytes_compat(-ib, 20, "big"))
print(to_bytes_compat(ib * -ib, 40, "big"))
# case where an additional byte is needed for sign bit
ib = (2**64) - 1
print(ib.to_bytes(8, "little"))
ib *= -1
try:
print(to_bytes_compat(ib, 8, "little"))
except OverflowError:
print("OverflowError")
print(to_bytes_compat(ib, 9, "little"))
print(to_bytes_compat(ib, 9, "big"))