mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 01:45:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

nle:source: Protect the probeid field with the GST_OBJECT_LOCK

Browse source 
Avoiding races where we try to remove a probe on an already destroyed pad.
This commit is contained in:
Thibault Saunier 2014-09-19 12:29:28 +02:00
parent 03c284abb6
commit 37f50193fd
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ges/nle/nlesource.c
View file

@ -136,6 +136,16 @@ nle_source_dispose (GObject * object)
if (priv->dispose_has_run) if (priv->dispose_has_run)
return; return;
GST_OBJECT_LOCK (object);
if (priv->probeid) {
GST_DEBUG_OBJECT (source, "Removing blocking probe! %lu", priv->probeid);
priv->areblocked = FALSE;
gst_pad_remove_probe (priv->ghostedpad, priv->probeid);
priv->probeid = 0;
}
GST_OBJECT_UNLOCK (object);
if (source->element) { if (source->element) {
gst_object_unref (source->element); gst_object_unref (source->element);
source->element = NULL; source->element = NULL;
@ -422,12 +432,14 @@ ghost_seek_pad (NleSource * source)
(NULL), ("Sending initial seek to upstream element failed")); (NULL), ("Sending initial seek to upstream element failed"));
} }
GST_OBJECT_LOCK (source);
if (priv->probeid) { if (priv->probeid) {
GST_DEBUG_OBJECT (source, "Removing blocking probe! %lu", priv->probeid); GST_DEBUG_OBJECT (source, "Removing blocking probe! %lu", priv->probeid);
priv->areblocked = FALSE; priv->areblocked = FALSE;
gst_pad_remove_probe (priv->ghostedpad, priv->probeid); gst_pad_remove_probe (priv->ghostedpad, priv->probeid);
priv->probeid = 0; priv->probeid = 0;
} }
GST_OBJECT_UNLOCK (source);
return NULL; return NULL;
} }
@ -481,9 +493,11 @@ nle_source_prepare (NleObject * object)
if (priv->staticpad) if (priv->staticpad)
pad = gst_object_ref (priv->staticpad); pad = gst_object_ref (priv->staticpad);
priv->ghostedpad = pad; priv->ghostedpad = pad;
GST_OBJECT_LOCK (source);
priv->probeid = gst_pad_add_probe (pad, priv->probeid = gst_pad_add_probe (pad,
GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM, GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM,
(GstPadProbeCallback) pad_blocked_cb, source, NULL); (GstPadProbeCallback) pad_blocked_cb, source, NULL);
GST_OBJECT_UNLOCK (source);
gst_object_unref (pad); gst_object_unref (pad);
} }