github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix memory leak in obj create functions if ext alloc fails

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2019-12-03 18:16:14 +01:00
parent 664a538e85
commit c7374948a1
36 changed files with 154 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/lv_misc/lv_mem.c
View File

@@ -247,8 +247,12 @@ void * lv_mem_realloc(void * data_p, size_t new_size)
void * new_p;
new_p = lv_mem_alloc(new_size);
if(new_p == NULL) {
LV_LOG_WARN("Couldn't allocate memory");
return NULL;
}
if(new_p != NULL && data_p != NULL) {
if(data_p != NULL) {
/*Copy the old data to the new. Use the smaller size*/
if(old_size != 0) {
memcpy(new_p, data_p, LV_MATH_MIN(new_size, old_size));
@@ -256,7 +260,6 @@ void * lv_mem_realloc(void * data_p, size_t new_size)
}
}
if(new_p == NULL) LV_LOG_WARN("Couldn't allocate memory");
return new_p;
}