gst/gstminiobject.c: Taking a NULL miniobject is valid, fix the case where we try...

Original commit message from CVS:
* gst/gstminiobject.c: (gst_value_take_mini_object):
Taking a NULL miniobject is valid, fix the case where
we try to unref the NULL miniobject.

diff --git a/ChangeLog b/ChangeLog
index ed4776a73ef1094eb738fbbfbf7cf4656dd2d4af..a6cb633b3be462b9fef233ef69e125ab73680ff6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-28  Wim Taymans  <wim@fluendo.com>
+
+       * gst/gstminiobject.c: (gst_value_take_mini_object):
+       Taking a NULL miniobject is valid, fix the case where
+       we try to unref the NULL miniobject.
+
 2006-04-28  Wim Taymans  <wim@fluendo.com>
 
        Patch by: Stefan Kost <ensonic at sonicpulse dot de>

diff --git a/gst/gstminiobject.c b/gst/gstminiobject.c
index 2e0569e5be8d9cfa68c3a05a7d6959a5c89507bc..279ec732f5b49aef18400a979f811118d25b9fd5 100644 (file)
--- a/gst/gstminiobject.c
+++ b/gst/gstminiobject.c
@@ -425,8 +425,11 @@ gst_value_take_mini_object (GValue * value, GstMiniObject * mini_object)
   g_return_if_fail (mini_object == NULL || GST_IS_MINI_OBJECT (mini_object));
 
   pointer_p = &value->data[0].v_pointer;
+  /* takes additional refcount */
   gst_mini_object_replace ((GstMiniObject **) pointer_p, mini_object);
-  gst_mini_object_unref (mini_object);
+  /* remove additional refcount */
+  if (mini_object)
+    gst_mini_object_unref (mini_object);
 }
 
 /**