mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-05-23 22:10:39 +02:00
Bug 557087 – mem leak in g_content_types_get_registered
svn path=/trunk/; revision=7616
This commit is contained in:
parent
94f082cb80
commit
cef6abff8e
@ -1,3 +1,9 @@
|
||||
2008-10-20 Christian Persch <chpe@gnome.org>
|
||||
|
||||
Bug 557087 – mem leak in g_content_types_get_registered
|
||||
|
||||
* gio/gcontenttype.c: Plug a mem leak.
|
||||
|
||||
2008-10-19 Michael Natterer <mitch@imendio.com>
|
||||
|
||||
Bug 556186 – gpoll.h breaks gmain.h inclusion
|
||||
|
@ -998,7 +998,7 @@ enumerate_mimetypes_subdir (const char *dir,
|
||||
if (g_str_has_suffix (ent->d_name, ".xml"))
|
||||
{
|
||||
mimetype = g_strdup_printf ("%s/%.*s", prefix, (int) strlen (ent->d_name) - 4, ent->d_name);
|
||||
g_hash_table_insert (mimetypes, mimetype, NULL);
|
||||
g_hash_table_replace (mimetypes, mimetype, NULL);
|
||||
}
|
||||
}
|
||||
closedir (d);
|
||||
@ -1053,7 +1053,7 @@ g_content_types_get_registered (void)
|
||||
int i;
|
||||
GList *l;
|
||||
|
||||
mimetypes = g_hash_table_new (g_str_hash, g_str_equal);
|
||||
mimetypes = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
|
||||
|
||||
enumerate_mimetypes_dir (g_get_user_data_dir (), mimetypes);
|
||||
dirs = g_get_system_data_dirs ();
|
||||
@ -1064,7 +1064,10 @@ g_content_types_get_registered (void)
|
||||
l = NULL;
|
||||
g_hash_table_iter_init (&iter, mimetypes);
|
||||
while (g_hash_table_iter_next (&iter, &key, NULL))
|
||||
l = g_list_prepend (l, key);
|
||||
{
|
||||
l = g_list_prepend (l, key);
|
||||
g_hash_table_iter_steal (&iter);
|
||||
}
|
||||
|
||||
g_hash_table_destroy (mimetypes);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user