[farsight2/master] msn: Don't leak codecbin on error

Olivier Crête olivier.crete at collabora.co.uk
Tue Jul 14 09:50:53 PDT 2009


---
 gst/fsmsnconference/fs-msn-stream.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gst/fsmsnconference/fs-msn-stream.c b/gst/fsmsnconference/fs-msn-stream.c
index 8d93995..f8c71b3 100644
--- a/gst/fsmsnconference/fs-msn-stream.c
+++ b/gst/fsmsnconference/fs-msn-stream.c
@@ -539,10 +539,6 @@ _connected (
     goto error;
   }
 
-  GST_OBJECT_LOCK (conference);
-  self->priv->codecbin = gst_object_ref (codecbin);
-  GST_OBJECT_UNLOCK (conference);
-
   if (!gst_bin_add (GST_BIN (conference), codecbin))
   {
     gst_object_unref (pad);
@@ -552,6 +548,10 @@ _connected (
     goto error;
   }
 
+  GST_OBJECT_LOCK (conference);
+  self->priv->codecbin = gst_object_ref (codecbin);
+  GST_OBJECT_UNLOCK (conference);
+
   if (self->priv->orig_direction == FS_DIRECTION_RECV)
   {
     FsCodec *mimic_codec;
-- 
1.5.6.5




More information about the farsight-commits mailing list