Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-06-02 01:18:04 +08:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

fix(table) fix memory leak

Browse Source 
See https://forum.lvgl.io/t/possible-memory-leak-in-table-widget/5254
This commit is contained in:
Gabor Kiss-Vamosi
2021-04-19 15:56:34 +02:00
parent 13d7256528
commit d857de043e
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/lv_table.c
+20
View File
@@ -207,6 +207,16 @@ void lv_table_set_row_cnt(lv_obj_t * obj, uint16_t row_cnt)
LV_ASSERT_MALLOC(table->row_h); LV_ASSERT_MALLOC(table->row_h);
if(table->row_h == NULL) return; if(table->row_h == NULL) return;
/*Free the unused cells*/
if(old_row_cnt > row_cnt) {
uint16_t old_cell_cnt = old_row_cnt * table->col_cnt;
uint32_t new_cell_cnt = table->col_cnt * table->row_cnt;
uint32_t i;
for(i = new_cell_cnt; i < old_cell_cnt; i++) {
lv_mem_free(table->cell_data[i]);
}
}
table->cell_data = lv_mem_realloc(table->cell_data, table->row_cnt * table->col_cnt * sizeof(char *)); table->cell_data = lv_mem_realloc(table->cell_data, table->row_cnt * table->col_cnt * sizeof(char *));
LV_ASSERT_MALLOC(table->cell_data); LV_ASSERT_MALLOC(table->cell_data);
if(table->cell_data == NULL) return; if(table->cell_data == NULL) return;
@@ -232,6 +242,16 @@ void lv_table_set_col_cnt(lv_obj_t * obj, uint16_t col_cnt)
LV_ASSERT_MALLOC(table->col_w); LV_ASSERT_MALLOC(table->col_w);
if(table->col_w == NULL) return; if(table->col_w == NULL) return;
/*Free the unused cells*/
if(old_col_cnt > col_cnt) {
uint16_t old_cell_cnt = old_col_cnt * table->row_cnt;
uint32_t new_cell_cnt = table->col_cnt * table->row_cnt;
uint32_t i;
for(i = new_cell_cnt; i < old_cell_cnt; i++) {
lv_mem_free(table->cell_data[i]);
}
}
char ** new_cell_data = lv_mem_alloc(table->row_cnt * table->col_cnt * sizeof(char *)); char ** new_cell_data = lv_mem_alloc(table->row_cnt * table->col_cnt * sizeof(char *));
LV_ASSERT_MALLOC(new_cell_data); LV_ASSERT_MALLOC(new_cell_data);
if(new_cell_data == NULL) return; if(new_cell_data == NULL) return;