gst: Fix floating reference inconsistencies in error cases

If a function takes a floating reference and sinks it, it should also do
that in error cases. I.e. call ref_sink() followed by unref().

Otherwise the reference counting behaviour of the function will be
different between the good and the error case, and simply inconsistent.

https://bugzilla.gnome.org/show_bug.cgi?id=747990

diff --git a/gst/gstbin.c b/gst/gstbin.c
index 3c0b2da3852e7c80031e8e3fef5e04cf5a828b76..688988f5a83c08d76a2fe958a4e26b190b378cce 100644 (file)
--- a/gst/gstbin.c
+++ b/gst/gstbin.c
@@ -1375,6 +1375,8 @@ duplicate_name:
         elem_name, GST_ELEMENT_NAME (bin));
     GST_OBJECT_UNLOCK (bin);
     g_free (elem_name);
+    gst_object_ref_sink (element);
+    gst_object_unref (element);
     return FALSE;
   }
 had_parent:
@@ -1382,6 +1384,8 @@ had_parent:
     g_warning ("Element '%s' already has parent", elem_name);
     GST_OBJECT_UNLOCK (bin);
     g_free (elem_name);
+    gst_object_ref_sink (element);
+    gst_object_unref (element);
     return FALSE;
   }
 }
@@ -1537,6 +1541,8 @@ no_function:
   {
     g_warning ("adding elements to bin '%s' is not supported",
         GST_ELEMENT_NAME (bin));
+    gst_object_ref_sink (element);
+    gst_object_unref (element);
     return FALSE;
   }
 }

diff --git a/gst/gstelement.c b/gst/gstelement.c
index bf579b48f39ca171bb899cec346c4a57a776a9c8..94efcb48c7e2cd56e1d8c0b1651ead187e25efde 100644 (file)
--- a/gst/gstelement.c
+++ b/gst/gstelement.c
@@ -723,6 +723,8 @@ name_exists:
         pad_name, GST_ELEMENT_NAME (element));
     GST_OBJECT_UNLOCK (element);
     g_free (pad_name);
+    gst_object_ref_sink (pad);
+    gst_object_unref (pad);
     return FALSE;
   }
 had_parent:
@@ -732,6 +734,8 @@ had_parent:
         pad_name, GST_ELEMENT_NAME (element));
     GST_OBJECT_UNLOCK (element);
     g_free (pad_name);
+    gst_object_ref_sink (pad);
+    gst_object_unref (pad);
     return FALSE;
   }
 no_direction:

diff --git a/gst/gstobject.c b/gst/gstobject.c
index 32a406d97bd1e25a5876bbf42de9a5fc734eb888..50fa1c7625706abd66be719c59aca02424e09f97 100644 (file)
--- a/gst/gstobject.c
+++ b/gst/gstobject.c
@@ -693,6 +693,8 @@ had_parent:
   {
     GST_CAT_DEBUG_OBJECT (GST_CAT_REFCOUNTING, object,
         "set parent failed, object already had a parent");
+    gst_object_ref_sink (object);
+    gst_object_unref (object);
     GST_OBJECT_UNLOCK (object);
     return FALSE;
   }