mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

gtk(gl)sink: remove the signal handlers on finalize

Browse source 
It's possible that the sink element will be freed before the widget is
destroyed.  When the widget was eventually destroyed, it was attempting to
access member variables of the freed sink struct which resulted in undefined
behaviour.

Fix by disconnecting our signal on finalize.

https://bugzilla.gnome.org/show_bug.cgi?id=762098
This commit is contained in:
Matthew Waters 2016-02-16 19:59:13 +11:00
parent caafdd8ca2
commit aaacc9fe54
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ext/gtk/gstgtkbasesink.c
View file

@ -141,9 +141,16 @@ gst_gtk_base_sink_init (GstGtkBaseSink * gtk_sink)
static void static void
gst_gtk_base_sink_finalize (GObject * object) gst_gtk_base_sink_finalize (GObject * object)
{ {
GstGtkBaseSink *gtk_sink = GST_GTK_BASE_SINK (object);; GstGtkBaseSink *gtk_sink = GST_GTK_BASE_SINK (object);
GST_OBJECT_LOCK (gtk_sink);
if (gtk_sink->window && gtk_sink->window_destroy_id)
g_signal_handler_disconnect (gtk_sink->window, gtk_sink->window_destroy_id);
if (gtk_sink->widget && gtk_sink->widget_destroy_id)
g_signal_handler_disconnect (gtk_sink->widget, gtk_sink->widget_destroy_id);
g_clear_object (&gtk_sink->widget); g_clear_object (&gtk_sink->widget);
GST_OBJECT_UNLOCK (gtk_sink);
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
@ -194,7 +201,7 @@ gst_gtk_base_sink_get_widget (GstGtkBaseSink * gtk_sink)
/* Take the floating ref, other wise the destruction of the container will /* Take the floating ref, other wise the destruction of the container will
* make this widget disapear possibly before we are done. */ * make this widget disapear possibly before we are done. */
gst_object_ref_sink (gtk_sink->widget); gst_object_ref_sink (gtk_sink->widget);
g_signal_connect (gtk_sink->widget, "destroy", gtk_sink->widget_destroy_id = g_signal_connect (gtk_sink->widget, "destroy",
G_CALLBACK (widget_destroy_cb), gtk_sink); G_CALLBACK (widget_destroy_cb), gtk_sink);
/* back pointer */ /* back pointer */
@ -316,7 +323,7 @@ gst_gtk_base_sink_start_on_main (GstBaseSink * bsink)
gtk_window_set_default_size (GTK_WINDOW (gst_sink->window), 640, 480); gtk_window_set_default_size (GTK_WINDOW (gst_sink->window), 640, 480);
gtk_window_set_title (GTK_WINDOW (gst_sink->window), klass->window_title); gtk_window_set_title (GTK_WINDOW (gst_sink->window), klass->window_title);
gtk_container_add (GTK_CONTAINER (gst_sink->window), toplevel); gtk_container_add (GTK_CONTAINER (gst_sink->window), toplevel);
g_signal_connect (gst_sink->window, "destroy", gst_sink->window_destroy_id = g_signal_connect (gst_sink->window, "destroy",
G_CALLBACK (window_destroy_cb), gst_sink); G_CALLBACK (window_destroy_cb), gst_sink);
} }

2
ext/gtk/gstgtkbasesink.h
View file

@ -69,6 +69,8 @@ struct _GstGtkBaseSink
GBinding *bind_ignore_alpha; GBinding *bind_ignore_alpha;
GtkWidget *window; GtkWidget *window;
gulong widget_destroy_id;
gulong window_destroy_id;
}; };
/** /**