diff options
| author | Damien George <damien.p.george@gmail.com> | 2017-06-15 14:21:02 +1000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2017-06-15 14:21:02 +1000 |
| commit | e269cabe3ed8bed1b7181359febb686edbb748ae (patch) | |
| tree | ff91eb8d3d4a1c0cbd276262c36f847043e20a06 | |
| parent | 8c5632a869f10445dc5091c39ec73ca49cf83454 (diff) | |
| download | micropython-e269cabe3ed8bed1b7181359febb686edbb748ae.tar.gz micropython-e269cabe3ed8bed1b7181359febb686edbb748ae.zip | |
py/objint: In to_bytes(), allow length arg to be any int and check sign.
| -rw-r--r-- | py/objint.c | 5 | ||||
| -rw-r--r-- | tests/basics/int_bytes.py | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/py/objint.c b/py/objint.c index 4801baa85e..0b49041399 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 5198792625..d1837ea75c 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") |