gst/gstplugin.c: Call g_module_close when we don't load the module

Original commit message from CVS:
* gst/gstplugin.c: (gst_plugin_load_file):
Call g_module_close when we don't load the module

* gst/registries/gstlibxmlregistry.c:
(gst_xml_registry_get_property):
Port leak fix from 0.8
This commit is contained in:
Jan Schmidt 2005-09-07 15:22:29 +00:00
parent af64fe644c
commit d5da128644
3 changed files with 15 additions and 3 deletions

View file

@ -1,3 +1,12 @@
2005-09-07 Jan Schmidt <thaytan@mad.scientist.com>
* gst/gstplugin.c: (gst_plugin_load_file):
Call g_module_close when we don't load the module
* gst/registries/gstlibxmlregistry.c:
(gst_xml_registry_get_property):
Port leak fix from 0.8
2005-09-07 Stefan Kost <ensonic@users.sf.net>
* docs/gst/gstreamer-docs.sgml:

View file

@ -414,9 +414,12 @@ gst_plugin_load_file (const gchar * filename, GError ** error)
module = g_module_open (filename, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
/* handle module == NULL case */
if (!gst_plugin_check_module (module, filename, error, &ptr))
/* gst_plugin_check_module handles module == NULL case */
if (!gst_plugin_check_module (module, filename, error, &ptr)) {
if (module != NULL)
g_module_close (module);
return NULL;
}
desc = (GstPluginDesc *) ptr;

View file

@ -241,7 +241,7 @@ gst_xml_registry_get_property (GObject * object, guint prop_id,
switch (prop_id) {
case PROP_LOCATION:
g_value_set_string (value, g_strdup (registry->location));
g_value_set_string (value, registry->location);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);