aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2023-09-21 16:31:46 +0000
committerDaniel Eklöf <daniel@ekloef.se>2023-09-21 16:31:46 +0000
commitb2963bbf80973bd23e1d4ff4ead0df917dce7c6b (patch)
tree2dd8c79f389cc77e1134e19cca0d761d7f95031f
parentwayland: check activation supported before activating (diff)
changelog: crash when xdg token is set, but compositor does not support activation
-rw-r--r--CHANGELOG.md3
-rw-r--r--wayland.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4730e1b..fe944218 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -93,10 +93,13 @@
another opaque, maximized window ([#1464][1464]).
* Double-width characters, and grapheme clusters breaking URL
auto-detection ([#1465][1465]).
+* Crash when `XDG_ACTIVATION_TOKEN` is set, but compositor does not
+ support XDG activation ([#1493][1493]).
[1436]: https://codeberg.org/dnkl/foot/issues/1436
[1464]: https://codeberg.org/dnkl/foot/issues/1464
[1465]: https://codeberg.org/dnkl/foot/issues/1465
+[1493]: https://codeberg.org/dnkl/foot/pulls/1493
### Security
diff --git a/wayland.c b/wayland.c
index d5dc838f..d12bfc48 100644
--- a/wayland.c
+++ b/wayland.c
@@ -1701,7 +1701,7 @@ wayl_win_init(struct terminal *term, const char *token)
wl_surface_commit(win->surface.surf);
/* Complete XDG startup notification */
- if (token && wayl->xdg_activation)
+ if (token && wayl->xdg_activation != NULL)
xdg_activation_v1_activate(wayl->xdg_activation, token, win->surface.surf);
if (!wayl_win_subsurface_new(win, &win->overlay, false)) {