mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-22 23:28:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

sdp: don't leak the ghost pad

Browse source 
The peer is already gone when pad_removed_cb() called, so the ghost cannot
be removed. Use g_object_set_data() instead to remember the ghost pad.

Copied from similar code in GstRTPBin.
This commit is contained in:
Michael Olbrich 2019-08-27 15:14:31 +02:00 committed by GStreamer Merge Bot
parent 86b01bb291
commit 58479bec37
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gst/sdp/gstsdpsrc.c
View file

@ -110,26 +110,21 @@ pad_added_cb (GstElement * element, GstPad * pad, gpointer user_data)
gst_static_pad_template_get (&src_template));
gst_pad_set_active (ghost, TRUE);
gst_element_add_pad (GST_ELEMENT_CAST (self), ghost);
g_object_set_data (G_OBJECT (pad), "GstSdpSrc.ghostpad", ghost);
}
static void
pad_removed_cb (GstElement * element, GstPad * pad, gpointer user_data)
{
GstSdpSrc *self = GST_SDP_SRC_CAST (user_data);
GstPad *peer;
GstPad *ghost;
peer = gst_pad_get_peer (pad);
if (peer) {
GstPad *ghost =
GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD (peer)));
ghost = g_object_get_data (G_OBJECT (pad), "GstSdpSrc.ghostpad");
if (ghost) {
g_object_set_data (G_OBJECT (pad), "GstSdpSrc.ghostpad", NULL);
if (ghost) {
gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (ghost), NULL);
gst_element_remove_pad (GST_ELEMENT_CAST (self), ghost);
gst_object_unref (ghost);
}
gst_object_unref (peer);
gst_pad_set_active (ghost, FALSE);
gst_element_remove_pad (GST_ELEMENT_CAST (self), ghost);
}
}