mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

parse: Fix memleak of unused delayed links

Browse source 
Attach the DelayedLink structure to the element, so that when
the element is disposed, the DelayedLink is freed.
This commit is contained in:
David Schleef 2009-10-28 22:03:44 -07:00
parent 746284f807
commit 62e236394a
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst/parse/grammar.y
View file

@ -104,8 +104,6 @@ typedef struct {
GstElement *sink; GstElement *sink;
GstCaps *caps; GstCaps *caps;
gulong signal_id; gulong signal_id;
/* FIXME: need to connect to "disposed" signal to clean up,
* but there is no such signal */
} DelayedLink; } DelayedLink;
typedef struct { typedef struct {
@ -424,6 +422,15 @@ gst_parse_free_link (link_t *link)
gst_parse_link_free (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 static void
gst_parse_found_pad (GstElement *src, GstPad *pad, gpointer data) 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 (src)), GST_STR_NULL (link->src_pad),
GST_STR_NULL (GST_ELEMENT_NAME (link->sink)), GST_STR_NULL (link->sink_pad)); GST_STR_NULL (GST_ELEMENT_NAME (link->sink)), GST_STR_NULL (link->sink_pad));
g_signal_handler_disconnect (src, link->signal_id); g_signal_handler_disconnect (src, link->signal_id);
g_free (link->src_pad); g_object_set_qdata (G_OBJECT (src),
g_free (link->sink_pad); g_quark_from_static_string ("GstParseDelayedLink"), NULL);
if (link->caps) gst_caps_unref (link->caps);
g_free (link);
} }
} }
/* both padnames and the caps may be 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", data->signal_id = g_signal_connect (src, "pad-added",
G_CALLBACK (gst_parse_found_pad), data); 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; return TRUE;
} }
} }