[glib/wip/gcleanup: 70/71] giomodule: Fix leaks in module loading
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/gcleanup: 70/71] giomodule: Fix leaks in module loading
- Date: Wed, 13 Nov 2013 11:40:08 +0000 (UTC)
commit 1c33661594a056a7b5ca332df63c0c5adc5500a7
Author: Stef Walter <stefw gnome org>
Date: Thu Nov 7 23:00:28 2013 +0100
giomodule: Fix leaks in module loading
https://bugzilla.gnome.org/show_bug.cgi?id=711798
gio/giomodule.c | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/gio/giomodule.c b/gio/giomodule.c
index c26d3d2..daa9f4c 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
@@ -489,7 +489,7 @@ g_io_modules_scan_all_in_directory_with_scope (const char *dirname,
g_io_extension_point_register (extension_points[i]);
extension_point->lazy_load_modules =
g_list_prepend (extension_point->lazy_load_modules,
- module);
+ g_object_ref (module));
}
}
else
@@ -497,15 +497,11 @@ g_io_modules_scan_all_in_directory_with_scope (const char *dirname,
/* Try to load and init types */
if (g_type_module_use (G_TYPE_MODULE (module)))
g_type_module_unuse (G_TYPE_MODULE (module)); /* Unload */
- else
- { /* Failure to load */
- g_printerr ("Failed to load module: %s\n", path);
- g_object_unref (module);
- g_free (path);
- continue;
- }
+ else /* Failure to load */
+ g_printerr ("Failed to load module: %s\n", path);
}
+ g_object_unref (module);
g_free (path);
}
}
@@ -868,8 +864,7 @@ _g_io_module_get_default (const gchar *extension_point,
done:
g_hash_table_insert (default_modules,
- g_strdup (extension_point),
- impl ? g_object_ref (impl) : NULL);
+ g_strdup (extension_point), impl);
g_rec_mutex_unlock (&default_modules_lock);
return impl;
@@ -1106,7 +1101,20 @@ _g_io_modules_ensure_loaded (void)
static void
g_io_extension_point_free (GIOExtensionPoint *ep)
{
+ GList *walk;
+
g_free (ep->name);
+
+ for (walk = ep->extensions; walk != NULL; walk = walk->next)
+ {
+ GIOExtension *extension = walk->data;
+
+ g_free (extension->name);
+ g_slice_free (GIOExtension, extension);
+ }
+ g_list_free_full (ep->lazy_load_modules, g_object_unref);
+ g_list_free (ep->extensions);
+
g_free (ep);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]