diff options
| author | Damien George <damien@micropython.org> | 2024-02-16 11:41:28 +1100 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2024-02-19 23:40:54 +1100 |
| commit | 24234937747e6d7fd920d21358fb26b826398e1a (patch) | |
| tree | 7f6662dc0889b5a1c051fc1b12cb7c8077584fd3 /py/obj.h | |
| parent | 9242e3d16d34dd15f1cd868681be45432b443c5a (diff) | |
py/obj: Change sizeof to offsetof in mp_obj_malloc_var macro.
Following b6a977848407a4ced45d118cf926bd915cc89dfb, to properly calculate
the size of the variable-length allocation.
Signed-off-by: Damien George <damien@micropython.org>
Diffstat (limited to 'py/obj.h')
| -rw-r--r-- | py/obj.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -913,7 +913,7 @@ extern const struct _mp_obj_exception_t mp_const_GeneratorExit_obj; // Helper versions of m_new_obj when you need to immediately set base.type. // Implementing this as a call rather than inline saves 8 bytes per usage. #define mp_obj_malloc(struct_type, obj_type) ((struct_type *)mp_obj_malloc_helper(sizeof(struct_type), obj_type)) -#define mp_obj_malloc_var(struct_type, var_type, var_num, obj_type) ((struct_type *)mp_obj_malloc_helper(sizeof(struct_type) + sizeof(var_type) * (var_num), obj_type)) +#define mp_obj_malloc_var(struct_type, var_field, var_type, var_num, obj_type) ((struct_type *)mp_obj_malloc_helper(offsetof(struct_type, var_field) + sizeof(var_type) * (var_num), obj_type)) void *mp_obj_malloc_helper(size_t num_bytes, const mp_obj_type_t *type); // These macros are derived from more primitive ones and are used to |