summaryrefslogtreecommitdiff
path: root/py/objarray.h
diff options
context:
space:
mode:
authorAndrew Leech <andrew.leech@planetinnovation.com.au>2022-08-07 16:24:37 +1000
committerDamien George <damien@micropython.org>2023-01-20 16:31:37 +1100
commit5c4153ea379550bf595bf0bfa0e3711afea17aa0 (patch)
tree75d7ab1912e8a3a24af38ea20a88d260eecb4dbf /py/objarray.h
parentd6bc34a13aa734d8b32e5768c021377ac4815029 (diff)
py/objarray: Raise error on out-of-bound memoryview slice start.
32-bit platforms only support a slice offset start of 24 bit max due to the limited size of the mp_obj_array_t.free member. Similarly on 64-bit platforms the limit is 56 bits. This commit adds an OverflowError if the user attempts to slice a memoryview beyond this limit. Signed-off-by: Damien George <damien@micropython.org>
Diffstat (limited to 'py/objarray.h')
-rw-r--r--py/objarray.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/py/objarray.h b/py/objarray.h
index 48a26c3fb..4a0e8a983 100644
--- a/py/objarray.h
+++ b/py/objarray.h
@@ -32,6 +32,9 @@
// Used only for memoryview types, set in "typecode" to indicate a writable memoryview
#define MP_OBJ_ARRAY_TYPECODE_FLAG_RW (0x80)
+// Bit size used for mp_obj_array_t.free member.
+#define MP_OBJ_ARRAY_FREE_SIZE_BITS (8 * sizeof(size_t) - 8)
+
// This structure is used for all of bytearray, array.array, memoryview
// objects. Note that memoryview has different meaning for some fields,
// see comment at the beginning of objarray.c.
@@ -44,7 +47,7 @@ typedef struct _mp_obj_array_t {
// parent object. (Union is not used to not go into a complication of
// union-of-bitfields with different toolchains). See comments in
// objarray.c.
- size_t free : (8 * sizeof(size_t) - 8);
+ size_t free : MP_OBJ_ARRAY_FREE_SIZE_BITS;
size_t len; // in elements
void *items;
} mp_obj_array_t;