From 2682f378c83886fa7427de7ea1459c4018289935 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Fri, 14 Dec 2018 18:38:21 +0200
Subject: [PATCH] pad: Let threads in the test take ownership of a strong
 reference to their pads

Otherwise it can easily happen that the pad is destroyed before the
thread disappears, as happened sometimes in the test_pad_probe_block_add_remove
test where joining of the thread was done *after* the pad was unreffed
and destroyed.

Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/issues/339
---
 tests/check/gst/gstpad.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/tests/check/gst/gstpad.c b/tests/check/gst/gstpad.c
index 24fdb30..3948a4d 100644
--- a/tests/check/gst/gstpad.c
+++ b/tests/check/gst/gstpad.c
@@ -1326,7 +1326,9 @@ block_async_cb_return_ok (GstPad * pad, GstPadProbeInfo * info,
 static gpointer
 push_buffer_async (GstPad * pad)
 {
-  return GINT_TO_POINTER (gst_pad_push (pad, gst_buffer_new ()));
+  gpointer ret = GINT_TO_POINTER (gst_pad_push (pad, gst_buffer_new ()));
+  gst_object_unref (pad);
+  return ret;
 }
 
 static void
@@ -1349,7 +1351,7 @@ test_pad_blocking_with_type (GstPadProbeType type)
   id = gst_pad_add_probe (pad, type, block_async_cb_return_ok, NULL, NULL);
 
   thread = g_thread_try_new ("gst-check", (GThreadFunc) push_buffer_async,
-      pad, NULL);
+      gst_object_ref (pad), NULL);
 
   /* wait for the block */
   while (!gst_pad_is_blocking (pad)) {
@@ -1413,6 +1415,7 @@ static gpointer
 add_idle_probe_async (GstPad * pad)
 {
   gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_IDLE, idle_probe_wait, NULL, NULL);
+  gst_object_unref (pad);
 
   return NULL;
 }
@@ -1441,8 +1444,8 @@ GST_START_TEST (test_pad_blocking_with_probe_type_idle)
 
   idle_probe_running = FALSE;
   idle_thread =
-      g_thread_try_new ("gst-check", (GThreadFunc) add_idle_probe_async, srcpad,
-      NULL);
+      g_thread_try_new ("gst-check", (GThreadFunc) add_idle_probe_async,
+      gst_object_ref (srcpad), NULL);
 
   /* wait for the idle function to signal it is being called */
   while (!idle_probe_running) {
@@ -1450,7 +1453,7 @@ GST_START_TEST (test_pad_blocking_with_probe_type_idle)
   }
 
   thread = g_thread_try_new ("gst-check", (GThreadFunc) push_buffer_async,
-      srcpad, NULL);
+      gst_object_ref (srcpad), NULL);
 
   while (!gst_pad_is_blocking (srcpad)) {
     g_usleep (10000);
@@ -1507,6 +1510,8 @@ pull_range_async (GstPad * pad)
   GstFlowReturn res = gst_pad_pull_range (pad, 0, 100, &buf);
   if (buf)
     gst_buffer_unref (buf);
+  gst_object_unref (pad);
+
   return GINT_TO_POINTER (res);
 }
 
@@ -1533,7 +1538,7 @@ GST_START_TEST (test_pad_probe_pull)
       block_async_cb_return_ok, NULL, NULL);
 
   thread = g_thread_try_new ("gst-check", (GThreadFunc) pull_range_async,
-      sinkpad, NULL);
+      gst_object_ref (sinkpad), NULL);
 
   /* wait for the block */
   while (!gst_pad_is_blocking (sinkpad)) {
@@ -1603,7 +1608,7 @@ GST_START_TEST (test_pad_probe_pull_idle)
   idle_probe_called = FALSE;
   get_range_wait = TRUE;
   thread = g_thread_try_new ("gst-check", (GThreadFunc) pull_range_async,
-      sinkpad, NULL);
+      gst_object_ref (sinkpad), NULL);
 
   /* wait for the block */
   while (!getrange_waiting) {
@@ -1662,7 +1667,7 @@ GST_START_TEST (test_pad_probe_pull_buffer)
   pull_probe_called_with_bad_data = FALSE;
 
   thread = g_thread_try_new ("gst-check", (GThreadFunc) pull_range_async,
-      sinkpad, NULL);
+      gst_object_ref (sinkpad), NULL);
 
   /* wait for the block */
   while (!pull_probe_called && !pull_probe_called_with_bad_data
@@ -1856,7 +1861,7 @@ GST_START_TEST (test_pad_probe_block_add_remove)
   fail_unless (pad->num_blocked == 1);
 
   thread = g_thread_try_new ("gst-check", (GThreadFunc) push_buffer_async,
-      pad, NULL);
+      gst_object_ref (pad), NULL);
 
   /* wait for the block */
   while (!gst_pad_is_blocking (pad))
-- 
2.7.4