mirrors/cage
1
0
Fork 0
mirror of https://github.com/cage-kiosk/cage.git synced 2026-02-05 04:06:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix segfault when title or app_id is NULL

Browse source
This commit is contained in:
Yuxuan Shui 2025-12-17 03:53:01 +00:00
parent ea2069f427
commit dafb28626f
No known key found for this signature in database
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
xdg_shell.c
View file

@ -225,8 +225,12 @@ handle_xdg_toplevel_map(struct wl_listener *listener, void *data)
view_map(view, xdg_shell_view->xdg_toplevel->base->surface);
wlr_foreign_toplevel_handle_v1_set_title(view->foreign_toplevel_handle, xdg_shell_view->xdg_toplevel->title);
wlr_foreign_toplevel_handle_v1_set_app_id(view->foreign_toplevel_handle, xdg_shell_view->xdg_toplevel->app_id);
if (xdg_shell_view->xdg_toplevel->title)
wlr_foreign_toplevel_handle_v1_set_title(view->foreign_toplevel_handle,
xdg_shell_view->xdg_toplevel->title);
if (xdg_shell_view->xdg_toplevel->app_id)
wlr_foreign_toplevel_handle_v1_set_app_id(view->foreign_toplevel_handle,
xdg_shell_view->xdg_toplevel->app_id);
/* Activation state will be set by seat_set_focus */
}

9
xwayland.c
View file

@ -142,9 +142,12 @@ handle_xwayland_surface_map(struct wl_listener *listener, void *data)
view_map(view, xwayland_view->xwayland_surface->surface);
wlr_foreign_toplevel_handle_v1_set_title(view->foreign_toplevel_handle, xwayland_view->xwayland_surface->title);
wlr_foreign_toplevel_handle_v1_set_app_id(view->foreign_toplevel_handle,
xwayland_view->xwayland_surface->class);
if (xwayland_view->xwayland_surface->title)
wlr_foreign_toplevel_handle_v1_set_title(view->foreign_toplevel_handle,
xwayland_view->xwayland_surface->title);
if (xwayland_view->xwayland_surface->class)
wlr_foreign_toplevel_handle_v1_set_app_id(view->foreign_toplevel_handle,
xwayland_view->xwayland_surface->class);
}
static void