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

lv_img: fix memory leak

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2018-12-20 22:48:10 +01:00
parent 693ab86a6c
commit 222ef3a76a
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lv_objx/lv_img.c
View File

@@ -155,19 +155,25 @@ void lv_img_set_src(lv_obj_t * img, const void * src_img)
lv_img_header_t header; lv_img_header_t header;
lv_img_dsc_get_info(src_img, &header); lv_img_dsc_get_info(src_img, &header);
/*Save the source*/ /*Save the source*/
if(src_type == LV_IMG_SRC_VARIABLE) { if(src_type == LV_IMG_SRC_VARIABLE) {
LV_LOG_INFO("lv_img_set_src: `LV_IMG_SRC_VARIABLE` type found"); LV_LOG_INFO("lv_img_set_src: `LV_IMG_SRC_VARIABLE` type found");
/*If memory was allocated because of the previous `src_type` then free it*/
if(ext->src_type == LV_IMG_SRC_FILE || ext->src_type == LV_IMG_SRC_SYMBOL) {
lv_mem_free(ext->src);
}
ext->src = src_img; ext->src = src_img;
} else if(src_type == LV_IMG_SRC_FILE || src_type == LV_IMG_SRC_SYMBOL) { } else if(src_type == LV_IMG_SRC_FILE || src_type == LV_IMG_SRC_SYMBOL) {
/* If the new and the old src are the same then it was only a refresh.*/ /* If the new and the old src are the same then it was only a refresh.*/
if(ext->src != src_img) { if(ext->src != src_img) {
/*If memory was allocated because of the previous `src_type` then free it*/
if(ext->src_type == LV_IMG_SRC_FILE || ext->src_type == LV_IMG_SRC_SYMBOL) { if(ext->src_type == LV_IMG_SRC_FILE || ext->src_type == LV_IMG_SRC_SYMBOL) {
lv_mem_free(ext->src); /*If memory was allocated because of the previous `src_type` then free it*/ lv_mem_free(ext->src);
} }
char * new_str = lv_mem_alloc(strlen(src_img) + 1); char * new_str = lv_mem_alloc(strlen(src_img) + 1);
lv_mem_assert(new_str); lv_mem_assert(new_str);
if(new_str == NULL) return; if(new_str == NULL) return;
strcpy(new_str, src_img); strcpy(new_str, src_img);