From 47b8893f9942902404e3eb3a4c81c0611fddc25b Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 1 Mar 2021 19:31:09 +0100 Subject: [PATCH] fix(mem) fix traeting data as lvgl alloacted even if LV_MEM_CUSTOM 1 --- src/lv_misc/lv_mem.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/lv_misc/lv_mem.c b/src/lv_misc/lv_mem.c index 3847219b9..6a2a8dd4b 100644 --- a/src/lv_misc/lv_mem.c +++ b/src/lv_misc/lv_mem.c @@ -228,16 +228,12 @@ void lv_mem_free(void * data) if(data == &zero_mem) return; if(data == NULL) return; -#if LV_ENABLE_GC == 0 - /*e points to the header*/ +#if LV_MEM_CUSTOM == 0 lv_mem_ent_t * e = (lv_mem_ent_t *)((uint8_t *)data - sizeof(lv_mem_header_t)); + e->header.s.used = 0; # if LV_MEM_ADD_JUNK lv_memset((void *)data, 0xbb, e->header.s.d_size); # endif -#endif - -#if LV_MEM_CUSTOM == 0 - e->header.s.used = 0; static uint32_t defr = 0; defr++;