summaryrefslogtreecommitdiffstats
path: root/video/out
diff options
context:
space:
mode:
authorllyyr <llyyr@yukari.in>2024-04-15 18:06:04 +0530
committerDudemanguy <random342@airmail.cc>2024-04-15 16:41:01 +0000
commit3995cd3714d2768f56c234633d1839f83746233b (patch)
tree6a4c4bfec38ccc445f96ba84af2e0eb4966f43f1 /video/out
parent919a042833202817492d1744e087836b6b02f63f (diff)
downloadmpv-3995cd3714d2768f56c234633d1839f83746233b.tar.bz2
mpv-3995cd3714d2768f56c234633d1839f83746233b.tar.xz
wayland: fix segfault in surface_handle_enter due to memory read
Fixes: 895f40e150d4 ("wayland: only perform a rescale if window is on one output")
Diffstat (limited to 'video/out')
-rw-r--r--video/out/wayland_common.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index ab96ede166..4a86c21c7e 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -957,7 +957,8 @@ static void surface_handle_enter(void *data, struct wl_surface *wl_surface,
update_output_geometry(wl, old_geometry, old_output_geometry);
MP_VERBOSE(wl, "Surface entered output %s %s (0x%x), scale = %f, refresh rate = %f Hz\n",
- o->make, o->model, o->id, wl->scaling, o->refresh_rate);
+ wl->current_output->make, wl->current_output->model,
+ wl->current_output->id, wl->scaling, wl->current_output->refresh_rate);
wl->pending_vo_events |= VO_EVENT_WIN_STATE;
}