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(span): add malloc result checks (#4085)

Browse Source
This commit is contained in:
Carlos Diaz 2023-03-24 02:04:07 -06:00 committed by GitHub
parent 490bc2b00e
commit 03142218e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/widgets/span/lv_span.c
View File

@ -128,9 +128,11 @@ void lv_spangroup_del_span(lv_obj_t * obj, lv_span_t * span)
_lv_ll_remove(&spans->child_ll, cur_span); _lv_ll_remove(&spans->child_ll, cur_span);
if(cur_span->txt && cur_span->static_flag == 0) { if(cur_span->txt && cur_span->static_flag == 0) {
lv_free(cur_span->txt); lv_free(cur_span->txt);
cur_span->txt = NULL;
} }
lv_style_reset(&cur_span->style); lv_style_reset(&cur_span->style);
lv_free(cur_span); lv_free(cur_span);
cur_span = NULL;
break; break;
} }
} }
@ -150,10 +152,15 @@ void lv_span_set_text(lv_span_t * span, const char * text)
if(span->txt == NULL || span->static_flag == 1) { if(span->txt == NULL || span->static_flag == 1) {
span->txt = lv_malloc(strlen(text) + 1); span->txt = lv_malloc(strlen(text) + 1);
LV_ASSERT_MALLOC(span->txt);
} }
else { else {
span->txt = lv_realloc(span->txt, strlen(text) + 1); span->txt = lv_realloc(span->txt, strlen(text) + 1);
LV_ASSERT_MALLOC(span->txt);
} }
if(span->txt == NULL) return;
span->static_flag = 0; span->static_flag = 0;
strcpy(span->txt, text); strcpy(span->txt, text);
@ -168,6 +175,7 @@ void lv_span_set_text_static(lv_span_t * span, const char * text)
if(span->txt && span->static_flag == 0) { if(span->txt && span->static_flag == 0) {
lv_free(span->txt); lv_free(span->txt);
span->txt = NULL;
} }
span->static_flag = 1; span->static_flag = 1;
span->txt = (char *)text; span->txt = (char *)text;
@ -521,6 +529,7 @@ static void lv_spangroup_destructor(const lv_obj_class_t * class_p, lv_obj_t * o
_lv_ll_remove(&spans->child_ll, cur_span); _lv_ll_remove(&spans->child_ll, cur_span);
if(cur_span->txt && cur_span->static_flag == 0) { if(cur_span->txt && cur_span->static_flag == 0) {
lv_free(cur_span->txt); lv_free(cur_span->txt);
cur_span->txt = NULL;
} }
lv_style_reset(&cur_span->style); lv_style_reset(&cur_span->style);
lv_free(cur_span); lv_free(cur_span);