From: Vivia Nikolaidou <vivia@ahiru.eu>
Date: Fri, 17 Jan 2020 15:44:34 +0000 (+0200)
Subject: mpegtsparse: Moved dispose function into finalize
X-Git-Tag: 1.19.3~507^2~2372
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d522bf3e61b6bcb5bb3b251469105ffbc4c5d73;p=platform%2Fupstream%2Fgstreamer.git

mpegtsparse: Moved dispose function into finalize

dispose can be called several times and would double-free the flow
combiner in that case.
---

diff --git a/gst/mpegtsdemux/mpegtsparse.c b/gst/mpegtsdemux/mpegtsparse.c
index 360bcea..a253a21 100644
--- a/gst/mpegtsdemux/mpegtsparse.c
+++ b/gst/mpegtsdemux/mpegtsparse.c
@@ -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,