diff options
author | Emmanuel Gil Peyrot <emmanuel.peyrot@collabora.com> | 2016-11-27 02:01:14 +0000 |
---|---|---|
committer | Emmanuel Gil Peyrot <emmanuel.peyrot@collabora.com> | 2016-11-27 02:01:14 +0000 |
commit | 89837523b5d18ad0f923a937ec11527c58f558cd (patch) | |
tree | 949d384c2a2dace5375d26e34c56c1fe3f5f3cb2 /video | |
parent | 1a2319f3e4cc42c680e2fd3ba30022c7a9adf3fe (diff) | |
download | mpv-89837523b5d18ad0f923a937ec11527c58f558cd.tar.bz2 mpv-89837523b5d18ad0f923a937ec11527c58f558cd.tar.xz |
wayland: destroy input before closing the display connection.
Fixes a segfault introduced in libwayland
e8ad23266f36521215dcd7cfcc524e0ef67d66dd, where a poison value has been
introduced to catch this kind of use-after-free bug.
Diffstat (limited to 'video')
-rw-r--r-- | video/out/wayland_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c index 480f29638b..a41fb6680a 100644 --- a/video/out/wayland_common.c +++ b/video/out/wayland_common.c @@ -946,8 +946,8 @@ void vo_wayland_uninit(struct vo *vo) struct vo_wayland_state *wl = vo->wayland; destroy_cursor(wl); destroy_window(wl); - destroy_display(wl); destroy_input(wl); + destroy_display(wl); for (int n = 0; n < 2; n++) close(wl->wakeup_pipe[n]); talloc_free(wl); |