luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-24 19:22:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

xdgmime: Free global data when rereading

Browse Source 
We were leading all of them in the need_reread case.
This commit is contained in:
Timm Bäder 2019-07-21 11:29:32 +02:00
parent 204c6255e4
commit aebdbd4aca
1 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
gio/xdgmime/xdgmime.c
View File

@ -496,6 +496,45 @@ xdg_check_time_and_dirs (void)
return retval; return retval;
} }
static void
free_globals (void)
{
if (global_hash)
{
_xdg_glob_hash_free (global_hash);
global_hash = NULL;
}
if (global_magic)
{
_xdg_mime_magic_free (global_magic);
global_magic = NULL;
}
if (alias_list)
{
_xdg_mime_alias_list_free (alias_list);
alias_list = NULL;
}
if (parent_list)
{
_xdg_mime_parent_list_free (parent_list);
parent_list = NULL;
}
if (icon_list)
{
_xdg_mime_icon_list_free (icon_list);
icon_list = NULL;
}
if (generic_icon_list)
{
_xdg_mime_icon_list_free (generic_icon_list);
generic_icon_list = NULL;
}
}
/* Called in every public function. It reloads the hash function if need be. /* Called in every public function. It reloads the hash function if need be.
*/ */
static void static void
@ -508,6 +547,8 @@ xdg_mime_init (void)
if (need_reread) if (need_reread)
{ {
free_globals ();
global_hash = _xdg_glob_hash_new (); global_hash = _xdg_glob_hash_new ();
global_magic = _xdg_mime_magic_new (); global_magic = _xdg_mime_magic_new ();
alias_list = _xdg_mime_alias_list_new (); alias_list = _xdg_mime_alias_list_new ();
@ -684,42 +725,9 @@ xdg_mime_shutdown (void)
xdg_dir_time_list_free (dir_time_list); xdg_dir_time_list_free (dir_time_list);
dir_time_list = NULL; dir_time_list = NULL;
} }
if (global_hash)
{
_xdg_glob_hash_free (global_hash);
global_hash = NULL;
}
if (global_magic)
{
_xdg_mime_magic_free (global_magic);
global_magic = NULL;
}
if (alias_list) free_globals ();
{
_xdg_mime_alias_list_free (alias_list);
alias_list = NULL;
}
if (parent_list)
{
_xdg_mime_parent_list_free (parent_list);
parent_list = NULL;
}
if (icon_list)
{
_xdg_mime_icon_list_free (icon_list);
icon_list = NULL;
}
if (generic_icon_list)
{
_xdg_mime_icon_list_free (generic_icon_list);
generic_icon_list = NULL;
}
if (_caches) if (_caches)
{ {
int i; int i;