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

clock: fix refcounting bug in gst_clock_set_master.

Browse source 
Make sure clock->clockid is unreffed before clock->master.
gst_clock_id_unschedule (clock->clockid) tries to access clock->master. If
clock->master is unreffed before and it's deallocated, _unschedule could access
free'd memory.
This commit is contained in:
Alessandro Decina 2010-07-05 13:01:53 +02:00 committed by Alessandro Decina
parent dda8663811
commit 538e82c6f7
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/gstclock.c
View file

@ -1078,11 +1078,8 @@ gst_clock_set_master (GstClock * clock, GstClock * master)
/* we always allow setting the master to NULL */ /* we always allow setting the master to NULL */
if (master && !GST_OBJECT_FLAG_IS_SET (clock, GST_CLOCK_FLAG_CAN_SET_MASTER)) if (master && !GST_OBJECT_FLAG_IS_SET (clock, GST_CLOCK_FLAG_CAN_SET_MASTER))
goto not_supported; goto not_supported;
GST_CAT_DEBUG_OBJECT (GST_CAT_CLOCK, clock, GST_CAT_DEBUG_OBJECT (GST_CAT_CLOCK, clock,
"slaving %p to master clock %p", clock, master); "slaving %p to master clock %p", clock, master);
master_p = &clock->master;
gst_object_replace ((GstObject **) master_p, (GstObject *) master);
GST_OBJECT_UNLOCK (clock); GST_OBJECT_UNLOCK (clock);
GST_CLOCK_SLAVE_LOCK (clock); GST_CLOCK_SLAVE_LOCK (clock);
@ -1103,6 +1100,11 @@ gst_clock_set_master (GstClock * clock, GstClock * master)
} }
GST_CLOCK_SLAVE_UNLOCK (clock); GST_CLOCK_SLAVE_UNLOCK (clock);
GST_OBJECT_LOCK (clock);
master_p = &clock->master;
gst_object_replace ((GstObject **) master_p, (GstObject *) master);
GST_OBJECT_UNLOCK (clock);
return TRUE; return TRUE;
/* ERRORS */ /* ERRORS */