meta-digi/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0007-waylandsink-do-not-des...

37 lines
1013 B
Diff

From 15464502cf5851e29fa5da9c6e1547655865de21 Mon Sep 17 00:00:00 2001
From: Hugues Fruchet <hugues.fruchet@st.com>
Date: Mon, 10 Dec 2018 17:36:27 +0100
Subject: [PATCH 07/14] waylandsink: do not destroy pool twice
Fix segfault in wayland client due to pool
destroy being called with null pool...
This problem was encountered with GStreamer-1.14.
Upstream-Status: Inappropriate [DEY specific]
Signed-off-by: Hugues Fruchet <hugues.fruchet@st.com>
---
ext/wayland/waylandpool.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/ext/wayland/waylandpool.c b/ext/wayland/waylandpool.c
index 1ba1f85..17a94f1 100644
--- a/ext/wayland/waylandpool.c
+++ b/ext/wayland/waylandpool.c
@@ -417,7 +417,12 @@ gst_wayland_buffer_pool_stop (GstBufferPool * pool)
GST_DEBUG_OBJECT (self, "Stopping wayland buffer pool");
+ /* already stopped... */
+ if (!self->wl_pool)
+ return FALSE;
+
munmap (self->data, self->size);
+
wl_shm_pool_destroy (self->wl_pool);
self->wl_pool = NULL;
--
2.25.1