aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshua <itis@isthisa.email>2022-11-09 01:01:50 -0500
committerGitHub <noreply@github.com>2022-11-09 00:01:50 -0600
commitf1639ba9d5c807792fe5d0628caa1faf3316ca44 (patch)
tree3800b6d010f86f0efa44c6136595cb1ce612421a
parent8bd344257501b9293126348bf956beb8c9ddcfae (diff)
check null in toplevel_from_popup
managed to SEGFAULT the server by trying to create a popup without setting a parent first. Not sure if this is dwl or wlroots issue, so also opened a ticket upstream: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3811
-rw-r--r--client.h4
-rw-r--r--dwl.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/client.h b/client.h
index 49982e0..38330d5 100644
--- a/client.h
+++ b/client.h
@@ -304,7 +304,9 @@ toplevel_from_popup(struct wlr_xdg_popup *popup)
while (1) {
switch (surface->role) {
case WLR_XDG_SURFACE_ROLE_POPUP:
- if (wlr_surface_is_layer_surface(surface->popup->parent))
+ if (!surface->popup->parent)
+ return NULL;
+ else if (wlr_surface_is_layer_surface(surface->popup->parent))
return wlr_layer_surface_v1_from_wlr_surface(surface->popup->parent)->data;
else if (!wlr_surface_is_xdg_surface(surface->popup->parent))
return NULL;
diff --git a/dwl.c b/dwl.c
index 52bfa58..5ee3c92 100644
--- a/dwl.c
+++ b/dwl.c
@@ -1016,6 +1016,8 @@ createnotify(struct wl_listener *listener, void *data)
if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) {
struct wlr_box box;
LayerSurface *l = toplevel_from_popup(xdg_surface->popup);
+ if (!xdg_surface->popup->parent)
+ return;
xdg_surface->surface->data = wlr_scene_xdg_surface_create(
xdg_surface->popup->parent->data, xdg_surface);
/* Probably the check of `l` is useless, the only thing that can be NULL