mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-10-22 09:12:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: sway crashes if switch to another workspace with surface when IME popup is shown

Browse source 
in pr https://github.com/swaywm/sway/pull/8196, when im_popup_surface is unmapped, author set the popup->relative to NULL, butt popup is still in popup groups, where assert the relative is not NULL, this cause the panic

Take the suggestion of Nefsen402, remove the line where set relative to
NULL, and add NULL check in scene_descriptor_destory
This commit is contained in:
ShootingStarDragons 2024-10-07 18:49:44 +09:00 committed by Alexander Orzechowski
parent c90cb37b2a
commit f855b0898b
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sway/input/text_input.c
View file

@ -454,6 +454,7 @@ static void handle_im_popup_surface_unmap(struct wl_listener *listener, void *da
struct sway_input_popup *popup = struct sway_input_popup *popup =
wl_container_of(listener, popup, popup_surface_unmap); wl_container_of(listener, popup, popup_surface_unmap);
scene_descriptor_destroy(&popup->scene_tree->node, SWAY_SCENE_DESC_POPUP);
// relative should already be freed as it should be a child of the just unmapped scene // relative should already be freed as it should be a child of the just unmapped scene
popup->desc.relative = NULL; popup->desc.relative = NULL;

3
sway/scene_descriptor.c
View file

@ -39,6 +39,9 @@ void *scene_descriptor_try_get(struct wlr_scene_node *node,
void scene_descriptor_destroy(struct wlr_scene_node *node, void scene_descriptor_destroy(struct wlr_scene_node *node,
enum sway_scene_descriptor_type type) { enum sway_scene_descriptor_type type) {
struct scene_descriptor *desc = scene_node_get_descriptor(node, type); struct scene_descriptor *desc = scene_node_get_descriptor(node, type);
if (!desc) {
return;
}
descriptor_destroy(desc); descriptor_destroy(desc);
} }