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(obj): fix segfault when obj_remove_flag is called for screen (#10104)

Browse Source
This commit is contained in:
André Costa
2026-05-11 14:18:32 +02:00
committed by GitHub
parent a04a3cd3b4
commit 75d166f02a
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/lv_obj.c
+7 -2
View File
@@ -307,15 +307,20 @@ void lv_obj_remove_flag(lv_obj_t * obj, lv_obj_flag_t f)
} }
obj->flags &= (~f); obj->flags &= (~f);
lv_obj_t * parent = lv_obj_get_parent(obj);
if(f & LV_OBJ_FLAG_HIDDEN) { if(f & LV_OBJ_FLAG_HIDDEN) {
lv_obj_invalidate(obj); lv_obj_invalidate(obj);
lv_obj_mark_layout_as_dirty(lv_obj_get_parent(obj)); if(parent) {
lv_obj_mark_layout_as_dirty(parent);
}
lv_obj_mark_layout_as_dirty(obj); lv_obj_mark_layout_as_dirty(obj);
} }
if((was_on_layout != lv_obj_is_layout_positioned(obj)) || (f & (LV_OBJ_FLAG_LAYOUT_1 | LV_OBJ_FLAG_LAYOUT_2))) { if((was_on_layout != lv_obj_is_layout_positioned(obj)) || (f & (LV_OBJ_FLAG_LAYOUT_1 | LV_OBJ_FLAG_LAYOUT_2))) {
lv_obj_mark_layout_as_dirty(lv_obj_get_parent(obj)); if(parent) {
lv_obj_mark_layout_as_dirty(parent);
}
} }
} }
tests/src/test_cases/widgets/test_obj_flags.c
+10
View File
@@ -237,4 +237,14 @@ void test_obj_flag_radio_button(void)
} }
void test_obj_flag_parent_hidden(void)
{
/* #10083: Ensure that adding and removing screen flags don't make lvgl crash*/
lv_obj_add_flag(lv_screen_active(), LV_OBJ_FLAG_HIDDEN);
TEST_ASSERT_TRUE(lv_obj_has_flag(lv_screen_active(), LV_OBJ_FLAG_HIDDEN));
lv_obj_remove_flag(lv_screen_active(), LV_OBJ_FLAG_HIDDEN);
TEST_ASSERT_FALSE(lv_obj_has_flag(lv_screen_active(), LV_OBJ_FLAG_HIDDEN));
TEST_PASS();
}
#endif #endif