mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

extmod/moductypes: Validate that uctypes.struct addr argument is an int. 

Fixes issue #12660.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2023-10-12 15:45:40 +11:00
parent 5015779a6f
commit 05cb1406ad
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extmod/moductypes.c
View File

@ -96,7 +96,7 @@ STATIC NORETURN void syntax_error(void) {
STATIC mp_obj_t uctypes_struct_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 2, 3, false);
mp_obj_uctypes_struct_t *o = mp_obj_malloc(mp_obj_uctypes_struct_t, type);
o->addr = (void *)(uintptr_t)mp_obj_int_get_truncated(args[0]);
o->addr = (void *)(uintptr_t)mp_obj_get_int_truncated(args[0]);
o->desc = args[1];
o->flags = LAYOUT_NATIVE;
if (n_args == 3) {

6
tests/extmod/uctypes_error.py
View File

@ -8,6 +8,12 @@ except ImportError:
data = bytearray(b"01234567")
# first argument isn't an integer
try:
uctypes.struct(data, {})
except TypeError:
print("TypeError")
# del subscr not supported
S = uctypes.struct(uctypes.addressof(data), {})
try:

1
tests/extmod/uctypes_error.py.exp
View File

@ -3,3 +3,4 @@ TypeError
TypeError
TypeError
TypeError
TypeError