Fix refcounting of gst_plugin_feature_load to match the docs.

Original commit message from CVS:
* gst/gstelementfactory.c: (gst_element_factory_create):
* gst/gstpluginfeature.c: (gst_plugin_feature_load):
* gst/gsttypefindfactory.c: (gst_type_find_factory_call_function):
* tools/gst-inspect.c: (print_element_info):
Fix refcounting of gst_plugin_feature_load to match the docs.
Fixes: #380129

diff --git a/ChangeLog b/ChangeLog
index c0f30e29a73b3bd5b17a2b41c25d240c083a5a95..4c4af1cb78a8d370484e054cae8966b2b01a2a1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-12-07  Jan Schmidt  <thaytan@mad.scientist.com>
+
+       * gst/gstelementfactory.c: (gst_element_factory_create):
+       * gst/gstpluginfeature.c: (gst_plugin_feature_load):
+       * gst/gsttypefindfactory.c: (gst_type_find_factory_call_function):
+       * tools/gst-inspect.c: (print_element_info):
+       Fix refcounting of gst_plugin_feature_load to match the docs. 
+       Fixes: #380129
+
 2006-12-07  Wim Taymans  <wim@fluendo.com>
 
        * libs/gst/base/gstbasesink.c: (gst_base_sink_event),

diff --git a/gst/gstelementfactory.c b/gst/gstelementfactory.c
index 55de1c431d22e9047e815bbec7c3d57b023684aa..d62ac2faf29d0fc075f54f5192178f097abc1a01 100644 (file)
--- a/gst/gstelementfactory.c
+++ b/gst/gstelementfactory.c
@@ -379,14 +379,18 @@ gst_element_factory_create (GstElementFactory * factory, const gchar * name)
 
   /* create an instance of the element, cast so we don't assert on NULL */
   element = GST_ELEMENT_CAST (g_object_new (factory->type, NULL));
-  if (element == NULL)
+  if (G_UNLIKELY (element == NULL))
     goto no_element;
 
   /* fill in the pointer to the factory in the element class. The
-   * class will not be unreffed currently. */
+   * class will not be unreffed currently. 
+   * FIXME: This isn't safe and may leak a refcount on the factory if 2 threads
+   * create the first instance of an element at the same moment */
   oclass = GST_ELEMENT_GET_CLASS (element);
-  if (oclass->elementfactory == NULL)
+  if (G_UNLIKELY (oclass->elementfactory == NULL))
     oclass->elementfactory = factory;
+  else
+    gst_object_unref (factory);
 
   if (name)
     gst_object_set_name (GST_OBJECT (element), name);
@@ -404,11 +408,13 @@ load_failed:
 no_type:
   {
     GST_WARNING_OBJECT (factory, "factory has no type");
+    gst_object_unref (factory);
     return NULL;
   }
 no_element:
   {
     GST_WARNING_OBJECT (factory, "could not create element");
+    gst_object_unref (factory);
     return NULL;
   }
 }

diff --git a/gst/gstpluginfeature.c b/gst/gstpluginfeature.c
index cc35e5debe17987cfc88af4b3913348810a5b5bb..72eee90e72c21ad47ae5f618ba10f6bd79396419 100644 (file)
--- a/gst/gstpluginfeature.c
+++ b/gst/gstpluginfeature.c
@@ -107,7 +107,7 @@ gst_plugin_feature_load (GstPluginFeature * feature)
   GST_DEBUG ("loading plugin for feature %p; '%s'", feature,
       GST_PLUGIN_FEATURE_NAME (feature));
   if (feature->loaded)
-    return feature;
+    return gst_object_ref (feature);
 
   GST_DEBUG ("loading plugin %s", feature->plugin_name);
   plugin = gst_plugin_load_by_name (feature->plugin_name);

diff --git a/gst/gsttypefindfactory.c b/gst/gsttypefindfactory.c
index 0a1cf1526688470910957a12d26ce335d1bcf0a4..607106b9f91dd4d67ef82d76f7f999adac49638f 100644 (file)
--- a/gst/gsttypefindfactory.c
+++ b/gst/gsttypefindfactory.c
@@ -241,5 +241,6 @@ gst_type_find_factory_call_function (GstTypeFindFactory * factory,
     g_assert (new_factory->function != NULL);
 
     new_factory->function (find, new_factory->user_data);
+    gst_object_unref (new_factory);
   }
 }

diff --git a/tools/gst-inspect.c b/tools/gst-inspect.c
index 5cb5f3ae835293d9e8fd75967bbd99e69a0e721e..6c5332cabd2119f896f4e07a383359872b998b49 100644 (file)
--- a/tools/gst-inspect.c
+++ b/tools/gst-inspect.c
@@ -1097,6 +1097,7 @@ print_element_info (GstElementFactory * factory, gboolean print_names)
   print_signal_info (element);
   print_children_info (element);
 
+  gst_object_unref (factory);
   if (_name[0] != '\0')
     g_free (_name);