mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 07:16:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

bus: Use new GSource dispose function

Browse source 
Without this it is possible that we have a GSource with reference count
0 stored in the GstBus that is currently in the process of being
destroyed. gst_bus_remove_watch() might then access it, increase its
reference count to 1 again, call GSource API on it and then unref it,
which will then finalize it a second time.

The dispose function allows the GSource to be resurrected until it
returned so the above would be safe now.

This caused some spurious crashes during shutdown in various
applications.
This commit is contained in:
Sebastian Dröge 2019-10-21 17:56:14 +03:00 committed by GStreamer Merge Bot
parent 4a554a2a68
commit 7af50da2c9
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gst/gstbus.c
View file

@ -852,20 +852,40 @@ no_handler:
}
}
#if GLIB_CHECK_VERSION(2,63,3)
static void
gst_bus_source_finalize (GSource * source)
gst_bus_source_dispose (GSource * source)
{
GstBusSource *bsource = (GstBusSource *) source;
GstBus *bus;
bus = bsource->bus;
GST_DEBUG_OBJECT (bus, "finalize source %p", source);
GST_DEBUG_OBJECT (bus, "disposing source %p", source);
GST_OBJECT_LOCK (bus);
if (bus->priv->signal_watch == source)
bus->priv->signal_watch = NULL;
GST_OBJECT_UNLOCK (bus);
}
#endif
static void
gst_bus_source_finalize (GSource * source)
{
GstBusSource *bsource = (GstBusSource *) source;
#if !GLIB_CHECK_VERSION(2,63,3)
GstBus *bus = bsource->bus;
#endif
GST_DEBUG_OBJECT (bus, "finalize source %p", source);
#if !GLIB_CHECK_VERSION(2,63,3)
GST_OBJECT_LOCK (bus);
if (bus->priv->signal_watch == source)
bus->priv->signal_watch = NULL;
GST_OBJECT_UNLOCK (bus);
#endif
gst_object_unref (bsource->bus);
bsource->bus = NULL;
@ -900,6 +920,9 @@ gst_bus_create_watch (GstBus * bus)
sizeof (GstBusSource));
g_source_set_name ((GSource *) source, "GStreamer message bus watch");
#if GLIB_CHECK_VERSION(2,63,3)
g_source_set_dispose_function ((GSource *) source, gst_bus_source_dispose);
#endif
source->bus = gst_object_ref (bus);
g_source_add_poll ((GSource *) source, &bus->priv->pollfd);