Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

fix(mem): with LV_MEM_CUSTOM don't try to realloc &zero_mem, use malloc instead

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2021-03-01 15:44:27 +01:00
parent 23a8c0b68a
commit 367e3a31df
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lv_misc/lv_mem.c
View File

@ -264,7 +264,15 @@ void * lv_mem_realloc(void * data_p, size_t new_size)
MEM_TRACE("reallocating 0x%p with %d size", data_p, new_size); MEM_TRACE("reallocating 0x%p with %d size", data_p, new_size);
void * new_p = NULL; void * new_p = NULL;
#if LV_MEM_CUSTOM #if LV_MEM_CUSTOM
new_p = LV_MEM_CUSTOM_REALLOC(data_p, new_size); if(new_size == 0) {
MEM_TRACE("using zero_mem");
LV_MEM_CUSTOM_FREE(data_p);
return &zero_mem;
}
if(data_p == &zero_mem) new_p = LV_MEM_CUSTOM_ALLOC(new_size);
else new_p = LV_MEM_CUSTOM_REALLOC(data_p, new_size);
if(new_p == NULL) { if(new_p == NULL) {
LV_LOG_ERROR("couldn't allocate memory"); LV_LOG_ERROR("couldn't allocate memory");
return NULL; return NULL;
@ -372,13 +380,12 @@ void lv_mem_defrag(void)
lv_res_t lv_mem_test(void) lv_res_t lv_mem_test(void)
{ {
#if LV_MEM_CUSTOM == 0
if(zero_mem != ZERO_MEM_SENTINEL) { if(zero_mem != ZERO_MEM_SENTINEL) {
LV_LOG_WARN("zero_mem is written"); LV_LOG_WARN("zero_mem is written");
return LV_RES_INV; return LV_RES_INV;
} }
#if LV_MEM_CUSTOM == 0
lv_mem_ent_t * e; lv_mem_ent_t * e;
e = ent_get_next(NULL); e = ent_get_next(NULL);
while(e) { while(e) {