aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md3
-rw-r--r--ime.c6
2 files changed, 9 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e60ffeaf..ac3422d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -88,8 +88,11 @@
* Use-after-free during shutdown when footclient and the client
application exit simultaneously in a short window ([#2432][2432]).
+* Crash when a buggy compositor sends an `ime_enter()` event with a
+ `NULL` surface ([#2467][2467]).
[2342]: https://codeberg.org/dnkl/foot/pulls/2432
+[2342]: https://codeberg.org/dnkl/foot/issues/2467
### Security
diff --git a/ime.c b/ime.c
index fa0e2cee..388ed097 100644
--- a/ime.c
+++ b/ime.c
@@ -55,6 +55,12 @@ static void
enter(void *data, struct zwp_text_input_v3 *zwp_text_input_v3,
struct wl_surface *surface)
{
+ if (unlikely(surface == NULL)) {
+ /* Seen on Hyprland */
+ LOG_WARN("compositor sent ime_enter event with a NULL surface");
+ return;
+ }
+
struct seat *seat = data;
struct wl_window *win = wl_surface_get_user_data(surface);
struct terminal *term = win->term;