From e269cabe3ed8bed1b7181359febb686edbb748ae Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Thu, 15 Jun 2017 14:21:02 +1000
Subject: [PATCH] py/objint: In to_bytes(), allow length arg to be any int and
check sign.
---
py/objint.c | 5 ++++-
tests/basics/int_bytes.py | 6 ++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/py/objint.c b/py/objint.c
index 4801baa85..0b4904139 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -435,7 +435,10 @@ STATIC mp_obj_t int_to_bytes(size_t n_args, const mp_obj_t *args) {
// TODO: Support signed param (assumes signed=False)
(void)n_args;
- mp_uint_t len = MP_OBJ_SMALL_INT_VALUE(args[1]);
+ mp_int_t len = mp_obj_get_int(args[1]);
+ if (len < 0) {
+ mp_raise_ValueError(NULL);
+ }
bool big_endian = args[2] != MP_OBJ_NEW_QSTR(MP_QSTR_little);
vstr_t vstr;
diff --git a/tests/basics/int_bytes.py b/tests/basics/int_bytes.py
index 519879262..d1837ea75 100644
--- a/tests/basics/int_bytes.py
+++ b/tests/basics/int_bytes.py
@@ -14,3 +14,9 @@ print((10).to_bytes(1, "big"))
print((100).to_bytes(10, "big"))
print(int.from_bytes(b"\0\0\0\0\0\0\0\0\0\x01", "big"))
print(int.from_bytes(b"\x01\0", "big"))
+
+# negative number of bytes should raise an error
+try:
+ (1).to_bytes(-1, "little")
+except ValueError:
+ print("ValueError")
--
GitLab