shared-module: Fix m_realloc/m_free when MICROPY_MALLOC_USES_ALLOCATED_SIZE is set

SamantazFox · SamantazFox · commit fb0aea86b6a6 · 2025-02-24T20:13:40.000+01:00
When 'MICROPY_MALLOC_USES_ALLOCATED_SIZE' is set, we need to pass the
previously allocated size to 'm_realloc', 'm_realloc_maybe' and 'm_free'.

Signed-off-by: Samantaz Fox &lt;coding@samantaz.fr&gt;
diff --git a/shared-module/atexit/__init__.c b/shared-module/atexit/__init__.c
@@ -12,8 +12,13 @@ static size_t callback_len = 0;
 static atexit_callback_t *callback = NULL;
 
 void atexit_reset(void) {
-    callback_len = 0;
+    #if MICROPY_MALLOC_USES_ALLOCATED_SIZE
+    m_free(callback, callback_len * sizeof(atexit_callback_t));
+    #else
     m_free(callback);
+    #endif
+
+    callback_len = 0;
     callback = NULL;
 }
 
@@ -39,7 +44,13 @@ void shared_module_atexit_register(mp_obj_t *func, size_t n_args, const mp_obj_t
         cb.args[i] = kw_args->table[cb.n_kw].key;
         cb.args[i += 1] = kw_args->table[cb.n_kw].value;
     }
-    callback = (atexit_callback_t *)m_realloc(callback, (callback_len + 1) * sizeof(cb));
+
+    callback = (atexit_callback_t *)m_realloc(callback,
+        #if MICROPY_MALLOC_USES_ALLOCATED_SIZE
+        callback_len *sizeof(cb), // Old size
+        #endif
+        (callback_len + 1) * sizeof(cb));
+
     callback[callback_len++] = cb;
 }
 
diff --git a/shared-module/displayio/OnDiskBitmap.c b/shared-module/displayio/OnDiskBitmap.c
@@ -95,7 +95,12 @@ void common_hal_displayio_ondiskbitmap_construct(displayio_ondiskbitmap_t *self,
             for (uint16_t i = 0; i < number_of_colors; i++) {
                 common_hal_displayio_palette_set_color(palette, i, palette_data[i]);
             }
+
+            #if MICROPY_MALLOC_USES_ALLOCATED_SIZE
+            m_free(palette_data, palette_size);
+            #else
             m_free(palette_data);
+            #endif
         } else {
             common_hal_displayio_palette_set_color(palette, 0, 0x0);
             common_hal_displayio_palette_set_color(palette, 1, 0xffffff);
diff --git a/shared-module/keypad/EventQueue.c b/shared-module/keypad/EventQueue.c
@@ -39,7 +39,13 @@ mp_obj_t common_hal_keypad_eventqueue_get(keypad_eventqueue_obj_t *self) {
     if (result) {
         return event;
     }
+
+    #if MICROPY_MALLOC_USES_ALLOCATED_SIZE
+    m_free(event, sizeof(keypad_event_obj_t));
+    #else
     m_free(event);
+    #endif
+
     return MP_ROM_NONE;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,13 @@ mp_obj_t common_hal_keypad_eventqueue_get(keypad_eventqueue_obj_t *self) {`
`39`	`39`	`if (result) {`
`40`	`40`	`return event;`
`41`	`41`	`}`
	`42`	`+`
	`43`	`+ #if MICROPY_MALLOC_USES_ALLOCATED_SIZE`
	`44`	`+ m_free(event, sizeof(keypad_event_obj_t));`
	`45`	`+ #else`
`42`	`46`	`m_free(event);`
	`47`	`+ #endif`
	`48`	`+`
`43`	`49`	`return MP_ROM_NONE;`
`44`	`50`	`}`
`45`	`51`