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

timecodestamper: Don't do finalizing in dispose

Browse source 
Add a finalize method and release locks and things in there, instead
of in the dispose method. Dispose may be called multiple times,
at any time, and should just safely release references to other
memory that might reference it back.

In this case, timecodestamper would later crash in the element
dispose method trying to take the freed mutex from
gst_timecodestamper_release_pad().

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5935>
This commit is contained in:
Jan Schmidt 2024-01-16 02:52:49 +11:00 committed by GStreamer Marge Bot
parent 5e3fafd025
commit e3fe89aba8
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
subprojects/gst-plugins-bad/gst/timecode/gsttimecodestamper.c
View file

@ -116,6 +116,7 @@ GST_STATIC_PAD_TEMPLATE ("ltc_sink",
GST_STATIC_CAPS ("audio/x-raw,format=U8,rate=[1,max],channels=1")
);
static void gst_timecodestamper_finalize (GObject * object);
static void gst_timecodestamper_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec);
static void gst_timecodestamper_get_property (GObject * object, guint prop_id,
@ -232,6 +233,7 @@ gst_timecodestamper_class_init (GstTimeCodeStamperClass * klass)
gobject_class->set_property = gst_timecodestamper_set_property;
gobject_class->get_property = gst_timecodestamper_get_property;
gobject_class->finalize = gst_timecodestamper_finalize;
gobject_class->dispose = gst_timecodestamper_dispose;
g_object_class_install_property (gobject_class, PROP_SOURCE,
@ -402,6 +404,20 @@ gst_timecodestamper_init (GstTimeCodeStamper * timecodestamper)
#endif
}
static void
gst_timecodestamper_finalize (GObject * object)
{
#if HAVE_LTC
GstTimeCodeStamper *timecodestamper = GST_TIME_CODE_STAMPER (object);
g_cond_clear (&timecodestamper->ltc_cond_video);
g_cond_clear (&timecodestamper->ltc_cond_audio);
g_mutex_clear (&timecodestamper->mutex);
#endif
G_OBJECT_CLASS (gst_timecodestamper_parent_class)->finalize (object);
}
static void
gst_timecodestamper_dispose (GObject * object)
{
@ -433,9 +449,7 @@ gst_timecodestamper_dispose (GObject * object)
timecodestamper->rtc_tc = NULL;
}
#if HAVE_LTC
g_cond_clear (&timecodestamper->ltc_cond_video);
g_cond_clear (&timecodestamper->ltc_cond_audio);
g_mutex_clear (&timecodestamper->mutex);
g_mutex_lock (&timecodestamper->mutex);
{
TimestampedTimecode *tc;
while ((tc = g_queue_pop_tail (&timecodestamper->ltc_current_tcs))) {
@ -458,6 +472,7 @@ gst_timecodestamper_dispose (GObject * object)
gst_audio_stream_align_free (timecodestamper->stream_align);
timecodestamper->stream_align = NULL;
}
g_mutex_unlock (&timecodestamper->mutex);
#endif
G_OBJECT_CLASS (gst_timecodestamper_parent_class)->dispose (object);