From 178bbc253da2e295018513de5b6c9a477d2b1125 Mon Sep 17 00:00:00 2001
From: fvanzile <frank@fvanzile.com>
Date: Thu, 23 Feb 2017 15:42:08 -0800
Subject: [PATCH] glcontext: keep a ref to the active thread

With the macOS/iOS implementations, the active thread can change
multiple times over the life of a pipeline which would expose a race in
the thread tracking.

Fix by taking a ref on the active thread while the context is active.

https://bugzilla.gnome.org/show_bug.cgi?id=779202
---
 gst-libs/gst/gl/gstglcontext.c | 54 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 44 insertions(+), 10 deletions(-)

diff --git a/gst-libs/gst/gl/gstglcontext.c b/gst-libs/gst/gl/gstglcontext.c
index 5550477..3ef068c 100644
--- a/gst-libs/gst/gl/gstglcontext.c
+++ b/gst-libs/gst/gl/gstglcontext.c
@@ -674,19 +674,37 @@ gst_gl_context_finalize (GObject * object)
         g_cond_wait (&context->priv->destroy_cond, &context->priv->render_lock);
       GST_INFO_OBJECT (context, "gl thread joined");
 
-      g_thread_unref (context->priv->gl_thread);
-      context->priv->gl_thread = NULL;
+      if (context->priv->gl_thread) {
+        g_thread_unref (context->priv->gl_thread);
+        context->priv->gl_thread = NULL;
+      }
     }
     g_mutex_unlock (&context->priv->render_lock);
 
     gst_gl_window_set_close_callback (context->window, NULL, NULL, NULL);
     gst_object_unref (context->window);
+    context->window = NULL;
   }
 
-  if (context->priv->sharegroup)
+  if (context->priv->active_thread) {
+    g_thread_unref (context->priv->active_thread);
+    context->priv->active_thread = NULL;
+  }
+
+  if (context->priv->gl_thread) {
+    g_thread_unref (context->priv->gl_thread);
+    context->priv->gl_thread = NULL;
+  }
+
+  if (context->priv->sharegroup) {
     _context_share_group_unref (context->priv->sharegroup);
+    context->priv->sharegroup = NULL;
+  }
 
-  gst_object_unref (context->display);
+  if (context->display) {
+    gst_object_unref (context->display);
+    context->display = NULL;
+  }
 
   if (context->gl_vtable) {
     g_slice_free (GstGLFuncs, context->gl_vtable);
@@ -735,10 +753,18 @@ gst_gl_context_activate (GstGLContext * context, gboolean activate)
   result = context_class->activate (context, activate);
 
   if (result && activate) {
-    context->priv->active_thread = g_thread_self ();
+    GThread *old_thread = context->priv->active_thread;
+    context->priv->active_thread = g_thread_ref (g_thread_self ());
+    if (old_thread) {
+      g_thread_unref (old_thread);
+    }
+
     g_private_set (&current_context_key, context);
   } else {
-    context->priv->active_thread = NULL;
+    if (context->priv->active_thread) {
+      g_thread_unref (context->priv->active_thread);
+      context->priv->active_thread = NULL;
+    }
     g_private_set (&current_context_key, NULL);
   }
   GST_OBJECT_UNLOCK (context);
@@ -1768,10 +1794,18 @@ gst_gl_wrapped_context_get_gl_platform (GstGLContext * context)
 static gboolean
 gst_gl_wrapped_context_activate (GstGLContext * context, gboolean activate)
 {
-  if (activate)
-    context->priv->gl_thread = g_thread_self ();
-  else
-    context->priv->gl_thread = NULL;
+  if (activate) {
+    GThread *old_thread = context->priv->gl_thread;
+    context->priv->gl_thread = g_thread_ref (g_thread_self ());
+    if (old_thread) {
+      g_thread_unref (old_thread);
+    }
+  } else {
+    if (context->priv->gl_thread) {
+      g_thread_unref (context->priv->gl_thread);
+      context->priv->gl_thread = NULL;
+    }
+  }
 
   return TRUE;
 }
-- 
2.7.4