mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-06-13 14:33:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

xdg-shell: protect against SIGABRT when TTY switching

Browse source 
Ensure we have got sensible toplevel width/height before trying to set
size on configure.

This protects against an edge case experienced when TTY switching between
labwc and Xfce running on XOrg on another TTY. It is not yet clear what
causes this, but hitting wlroots assert() is not great, so let's protect
against it.

Written-by: @Tamaranch

Fixes: #3608
This commit is contained in:
Johan Malm 2026-06-03 21:20:21 +01:00
parent d5b5b765c7
commit 8469061ce5
1 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/xdg.c
View file

@ -621,7 +621,24 @@ xdg_toplevel_view_configure(struct view *view, struct wlr_box geo)
if (geo.width != view->pending.width
|| geo.height != view->pending.height) {
if (toplevel->base->initialized) {
serial = wlr_xdg_toplevel_set_size(toplevel, geo.width, geo.height);
/*
* geo.{width,height} are checked here to guard against
* an odd edge-case reported in #3608 which involves TTY
* switching between labwc and Xfce running on X.Org on
* another TTY. It is not yet clear what causes this,
* but hitting wlroots assert() is not great, so let's
* protect against it.
*
* Ref:
* - https://github.com/labwc/labwc/issues/3608
*/
if (geo.width > 0 && geo.height > 0) {
serial = wlr_xdg_toplevel_set_size(toplevel,
geo.width, geo.height);
} else {
wlr_log(WLR_ERROR, "cannot set size %dx%d",
geo.width, geo.height);
}
} else {
/*
* This may happen, for example, when a panel resizes because a