aboutsummaryrefslogtreecommitdiff
path: root/sway
diff options
context:
space:
mode:
authorBrian Ashworth <bosrsf04@gmail.com>2019-02-12 23:21:11 -0500
committeremersion <contact@emersion.fr>2019-02-13 09:51:40 +0100
commitd168d65f2c0297bf5662c0f48f5f53705e54a376 (patch)
tree713ecaee3ef3fc3eb3077ae06327f3a058e76e2b /sway
parent1bccde68a4fadd0b4170faa16b97554a864447d4 (diff)
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`.
Diffstat (limited to 'sway')
-rw-r--r--sway/tree/view.c3
1 files changed, 3 insertions, 0 deletions
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;