From 89837523b5d18ad0f923a937ec11527c58f558cd Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <emmanuel.peyrot@collabora.com>
Date: Sun, 27 Nov 2016 02:01:14 +0000
Subject: 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.
---
 video/out/wayland_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
-- 
cgit v1.2.3