mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-02 12:32:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegtsparse: Moved dispose function into finalize

Browse source 
dispose can be called several times and would double-free the flow
combiner in that case.
This commit is contained in:
Vivia Nikolaidou 2020-01-17 17:44:34 +02:00 committed by GStreamer Merge Bot
parent 0d2e908523
commit 8d522bf3e6
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst/mpegtsdemux/mpegtsparse.c
View file

@ -131,20 +131,12 @@ static GstFlowReturn
drain_pending_buffers (MpegTSParse2 * parse, gboolean drain_all);
static void
mpegts_parse_dispose (GObject * object)
mpegts_parse_finalize (GObject * object)
{
MpegTSParse2 *parse = (MpegTSParse2 *) object;
gst_flow_combiner_free (parse->flowcombiner);
GST_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
}
static void
mpegts_parse_finalize (GObject * object)
{
MpegTSParse2 *parse = (MpegTSParse2 *) object;
gst_adapter_clear (parse->ts_adapter.adapter);
g_object_unref (parse->ts_adapter.adapter);
@ -160,7 +152,6 @@ mpegts_parse_class_init (MpegTSParse2Class * klass)
gobject_class->set_property = mpegts_parse_set_property;
gobject_class->get_property = mpegts_parse_get_property;
gobject_class->dispose = mpegts_parse_dispose;
gobject_class->finalize = mpegts_parse_finalize;
g_object_class_install_property (gobject_class, PROP_SET_TIMESTAMPS,