From f90ab92547dcc2034744ed2abab2077be804b5c6 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Wed, 7 Sep 2016 10:12:18 -0400 Subject: [PATCH] stream: Fix leaked joined_bin There is no need to keep a strong ref on it, and _leave_bin() was setting it to NULL before calling g_clear_object() so it was leaked. https://bugzilla.gnome.org/show_bug.cgi?id=766612 --- common | 2 +- gst/rtsp-server/rtsp-stream.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/common b/common index f49c55e..6f2d209 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit f49c55ecd35a7436194d28297f6d6f20eb6a66fa +Subproject commit 6f2d2093e84cc0eb99b634fa281822ebb9507285 diff --git a/gst/rtsp-server/rtsp-stream.c b/gst/rtsp-server/rtsp-stream.c index c57d13d..61ffa3e 100644 --- a/gst/rtsp-server/rtsp-stream.c +++ b/gst/rtsp-server/rtsp-stream.c @@ -2768,7 +2768,7 @@ gst_rtsp_stream_join_bin (GstRTSPStream * stream, GstBin * bin, (GCallback) caps_notify, stream); } - priv->joined_bin = gst_object_ref (bin); + priv->joined_bin = bin; g_mutex_unlock (&priv->lock); return TRUE; @@ -2920,7 +2920,6 @@ gst_rtsp_stream_leave_bin (GstRTSPStream * stream, GstBin * bin, gst_rtsp_address_free (priv->server_addr_v6); priv->server_addr_v6 = NULL; - g_clear_object (&priv->joined_bin); g_mutex_unlock (&priv->lock); return TRUE; -- 2.7.4