From 2aecf93fd7fdb3c4c06063942599b6b7d28dd635 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Fri, 3 Jan 2020 07:36:33 +0100 Subject: [PATCH] xwayland: handle size_hints == NULL In case xcb-iccm is not installed on the system, size_hints will be null. Handle this as if the get_constraints functions was not implemented and return the defaults. Fixes #4870 --- sway/desktop/xwayland.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 845d158d..e99fe06a 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c @@ -298,6 +298,15 @@ static void get_constraints(struct sway_view *view, double *min_width, double *max_width, double *min_height, double *max_height) { struct wlr_xwayland_surface *surface = view->wlr_xwayland_surface; struct wlr_xwayland_surface_size_hints *size_hints = surface->size_hints; + + if (size_hints == NULL) { + *min_width = DBL_MIN; + *max_width = DBL_MAX; + *min_height = DBL_MIN; + *max_height = DBL_MAX; + return; + } + *min_width = size_hints->min_width > 0 ? size_hints->min_width : DBL_MIN; *max_width = size_hints->max_width > 0 ? size_hints->max_width : DBL_MAX; *min_height = size_hints->min_height > 0 ? size_hints->min_height : DBL_MIN;