parse: Fix memleak of unused delayed links

Attach the DelayedLink structure to the element, so that when
the element is disposed, the DelayedLink is freed.

diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y
index db2888707ae6da96be6957b054a3816e4682e797..06345ce7760ca0072a5dc2bd79e04949a28f63d2 100644 (file)
--- a/gst/parse/grammar.y
+++ b/gst/parse/grammar.y
@@ -104,8 +104,6 @@ typedef struct {
   GstElement *sink;
   GstCaps *caps;
   gulong signal_id;
-  /* FIXME: need to connect to "disposed" signal to clean up,
-   * but there is no such signal */
 } DelayedLink;
 
 typedef struct {
@@ -424,6 +422,15 @@ gst_parse_free_link (link_t *link)
   gst_parse_link_free (link);  
 }
 
+static void
+gst_parse_free_delayed_link (DelayedLink *link)
+{
+  g_free (link->src_pad);
+  g_free (link->sink_pad);
+  if (link->caps) gst_caps_unref (link->caps);
+  g_free (link);
+}
+
 static void
 gst_parse_found_pad (GstElement *src, GstPad *pad, gpointer data)
 {
@@ -441,10 +448,8 @@ gst_parse_found_pad (GstElement *src, GstPad *pad, gpointer data)
                           GST_STR_NULL (GST_ELEMENT_NAME (src)), GST_STR_NULL (link->src_pad),
                           GST_STR_NULL (GST_ELEMENT_NAME (link->sink)), GST_STR_NULL (link->sink_pad));
     g_signal_handler_disconnect (src, link->signal_id);
-    g_free (link->src_pad);
-    g_free (link->sink_pad);
-    if (link->caps) gst_caps_unref (link->caps);
-    g_free (link);
+    g_object_set_qdata (G_OBJECT (src),
+        g_quark_from_static_string ("GstParseDelayedLink"), NULL);
   }
 }
 /* both padnames and the caps may be NULL */
@@ -479,6 +484,9 @@ gst_parse_perform_delayed_link (GstElement *src, const gchar *src_pad,
       }
       data->signal_id = g_signal_connect (src, "pad-added",
           G_CALLBACK (gst_parse_found_pad), data);
+      g_object_set_qdata_full (G_OBJECT (src),
+          g_quark_from_static_string ("GstParseDelayedLink"), data,
+         (GDestroyNotify)gst_parse_free_delayed_link);
       return TRUE;
     }
   }