From: Thiago Santos <thiago.sousa.santos@collabora.com>
Date: Tue, 27 Dec 2011 17:37:26 +0000 (-0300)
Subject: oggmux: fix leak when initializing pads
X-Git-Tag: 1.19.3~511^2~6555^2~211
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=08022bddc84c8a75b5af0f287ce2416edf31f417;p=platform%2Fupstream%2Fgstreamer.git

oggmux: fix leak when initializing pads

Pads are initialized twice: when requesting pads and when
initializing collectpads. Avoid double initialization by
checking if collectpads are still going to be initialized when
creating request pads.
---

diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c
index 80147eb..7aeecc0 100644
--- a/ext/ogg/gstoggmux.c
+++ b/ext/ogg/gstoggmux.c
@@ -467,7 +467,6 @@ gst_ogg_mux_request_new_pad (GstElement * element,
       ogg_mux->active_pads++;
 
       oggpad->map.serialno = serial;
-      ogg_stream_init (&oggpad->map.stream, oggpad->map.serialno);
       oggpad->packetno = 0;
       oggpad->pageno = 0;
       oggpad->eos = FALSE;
@@ -477,12 +476,18 @@ gst_ogg_mux_request_new_pad (GstElement * element,
       oggpad->first_delta = FALSE;
       oggpad->prev_delta = FALSE;
       oggpad->data_pushed = FALSE;
-      oggpad->pagebuffers = g_queue_new ();
       oggpad->map.headers = NULL;
       oggpad->map.queued = NULL;
       oggpad->next_granule = 0;
       oggpad->keyframe_granule = -1;
 
+      if (GST_STATE (ogg_mux) > GST_STATE_READY) {
+        /* This will be initialized in init_collectpads when going from ready
+         * paused state */
+        ogg_stream_init (&oggpad->map.stream, oggpad->map.serialno);
+        oggpad->pagebuffers = g_queue_new ();
+      }
+
       gst_segment_init (&oggpad->segment, GST_FORMAT_TIME);
 
       oggpad->collect_event = (GstPadEventFunction) GST_PAD_EVENTFUNC (newpad);