aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kenny Levinsen <kl@kl.wtf>2021-03-24 00:49:13 +0100
committerLibravatar Simon Ser <contact@emersion.fr>2021-03-24 00:55:15 +0100
commitd79ea9a0db11abbdad1e751326a06d6d48332f07 (patch)
tree42040af03199951dfaafd0b3ed4dfcd16d236468
parentswaybar: fail gracefully on tokener creation fail (diff)
downloadsway-d79ea9a0db11abbdad1e751326a06d6d48332f07.tar.gz
sway-d79ea9a0db11abbdad1e751326a06d6d48332f07.tar.zst
sway-d79ea9a0db11abbdad1e751326a06d6d48332f07.zip
view: subsurface NULL check in view_from_wlr_surface
Necessary NULL checks had been added to xdg_shell and xwayland surfaces, but subsurfaces had been missed.
-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 395b9fac..c762fa22 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -1157,6 +1157,9 @@ struct sway_view *view_from_wlr_surface(struct wlr_surface *wlr_surface) {
1157 if (wlr_surface_is_subsurface(wlr_surface)) { 1157 if (wlr_surface_is_subsurface(wlr_surface)) {
1158 struct wlr_subsurface *subsurface = 1158 struct wlr_subsurface *subsurface =
1159 wlr_subsurface_from_wlr_surface(wlr_surface); 1159 wlr_subsurface_from_wlr_surface(wlr_surface);
1160 if (subsurface == NULL) {
1161 return NULL;
1162 }
1160 return view_from_wlr_surface(subsurface->parent); 1163 return view_from_wlr_surface(subsurface->parent);
1161 } 1164 }
1162 if (wlr_surface_is_layer_surface(wlr_surface)) { 1165 if (wlr_surface_is_layer_surface(wlr_surface)) {