From d168d65f2c0297bf5662c0f48f5f53705e54a376 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Tue, 12 Feb 2019 23:21:11 -0500 Subject: subsurface_get_root_coords: break on NULL It is possible for `wlr_surface_is_subsurface` to return true, but `wlr_surface_from_wlr_surface` to be NULL. This adds a NULL check to the value returned by `wlr_surface_from_wlr_surface` and breaks out of the while loop in `subsurface_get_root_coords`. --- sway/tree/view.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sway/tree/view.c b/sway/tree/view.c index 943734dc..ca13def7 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -708,6 +708,9 @@ static void subsurface_get_root_coords(struct sway_view_child *child, while (surface && wlr_surface_is_subsurface(surface)) { struct wlr_subsurface *subsurface = wlr_subsurface_from_wlr_surface(surface); + if (subsurface == NULL) { + break; + } *root_sx += subsurface->current.x; *root_sy += subsurface->current.y; surface = subsurface->parent; -- cgit v1.2.3-54-g00ecf