Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-27 11:57:48 +08:00
Code Issues Actions 38 Packages Projects Releases Wiki Activity

fix(span): add assertion for bidi text buffer allocation (#8168)

Browse Source 
Signed-off-by: liuhongchao <liuhongchao@xiaomi.com>
This commit is contained in:
红桃六
2025-05-02 17:26:13 +08:00
committed by GitHub
parent 26043c2036
commit 20498bda45
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/span/lv_span.c
+2
View File
@@ -1149,6 +1149,7 @@ static void lv_draw_span(lv_obj_t * obj, lv_layer_t * layer)
char * bidi_txt; char * bidi_txt;
if(base_dir == LV_BASE_DIR_RTL) { if(base_dir == LV_BASE_DIR_RTL) {
bidi_txt = lv_malloc(pinfo->bytes + 1); bidi_txt = lv_malloc(pinfo->bytes + 1);
LV_ASSERT_MALLOC(bidi_txt);
lv_memcpy(bidi_txt, pinfo->txt, (size_t)pinfo->bytes); lv_memcpy(bidi_txt, pinfo->txt, (size_t)pinfo->bytes);
label_draw_dsc.bidi_dir = base_dir; label_draw_dsc.bidi_dir = base_dir;
label_draw_dsc.has_bided = true; label_draw_dsc.has_bided = true;
@@ -1211,6 +1212,7 @@ static void lv_draw_span(lv_obj_t * obj, lv_layer_t * layer)
if(base_dir == LV_BASE_DIR_RTL) { if(base_dir == LV_BASE_DIR_RTL) {
if(txt_bytes > label_draw_dsc.text_length) { if(txt_bytes > label_draw_dsc.text_length) {
char * tmp_txt = lv_malloc(label_draw_dsc.text_length + 1); char * tmp_txt = lv_malloc(label_draw_dsc.text_length + 1);
LV_ASSERT_MALLOC(tmp_txt);
if(lv_bidi_detect_base_dir(bidi_txt) == LV_BASE_DIR_RTL) { if(lv_bidi_detect_base_dir(bidi_txt) == LV_BASE_DIR_RTL) {
lv_memcpy(tmp_txt, bidi_txt + (txt_bytes - label_draw_dsc.text_length), (size_t)label_draw_dsc.text_length); lv_memcpy(tmp_txt, bidi_txt + (txt_bytes - label_draw_dsc.text_length), (size_t)label_draw_dsc.text_length);