diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gst/rtsp/gstrtspsrc.c | 12 |
2 files changed, 18 insertions, 2 deletions
@@ -2,6 +2,14 @@ Patch by: Tommi Myöhänen <ext-tommi dot myohanen at nokia dot com> + * gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_stream_free), + (gst_rtspsrc_stream_configure_tcp): + Fix 3 pad leaks. Fixes #496983. + +2007-11-15 Wim Taymans <wim.taymans@gmail.com> + + Patch by: Tommi Myöhänen <ext-tommi dot myohanen at nokia dot com> + * gst/rtp/gstrtph264depay.c: (gst_rtp_h264_depay_setcaps): Fix small leak. Fixes #497017. diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c index 98d1c597..aa13ad12 100644 --- a/gst/rtsp/gstrtspsrc.c +++ b/gst/rtsp/gstrtspsrc.c @@ -692,8 +692,6 @@ gst_rtspsrc_stream_free (GstRTSPSrc * src, GstRTSPStream * stream) pad = gst_element_get_pad (udpsrc, "src"); if (stream->channelpad[i]) { gst_pad_unlink (pad, stream->channelpad[i]); - gst_object_unref (stream->channelpad[i]); - stream->channelpad[i] = NULL; } gst_element_set_state (udpsrc, GST_STATE_NULL); @@ -701,6 +699,10 @@ gst_rtspsrc_stream_free (GstRTSPSrc * src, GstRTSPStream * stream) gst_object_unref (stream->udpsrc[i]); stream->udpsrc[i] = NULL; } + if (stream->channelpad[i]) { + gst_object_unref (stream->channelpad[i]); + stream->channelpad[i] = NULL; + } } if (stream->udpsink) { gst_element_set_state (stream->udpsink, GST_STATE_NULL); @@ -716,6 +718,10 @@ gst_rtspsrc_stream_free (GstRTSPSrc * src, GstRTSPStream * stream) } stream->srcpad = NULL; } + if (stream->rtcppad) { + gst_object_unref (stream->rtcppad); + stream->rtcppad = NULL; + } g_free (stream); } @@ -1875,6 +1881,8 @@ gst_rtspsrc_stream_configure_tcp (GstRTSPSrc * src, GstRTSPStream * stream, /* and link */ if (pad) gst_pad_link (pad, stream->rtcppad); + + gst_object_unref (template); } return TRUE; } |