luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-09 20:35:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't leak GKeyFile

Browse Source 
2008-01-22  Alexander Larsson  <alexl@redhat.com>

        * gdesktopappinfo.c:
        (g_desktop_app_info_new_from_filename):
	Don't leak GKeyFile



svn path=/trunk/; revision=6355
This commit is contained in:
Alexander Larsson 2008-01-22 14:15:51 +00:00 committed by Alexander Larsson
parent 10cd55875a
commit aa88b00475
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/ChangeLog
View File

@ -1,3 +1,9 @@
2008-01-22 Alexander Larsson <alexl@redhat.com>
* gdesktopappinfo.c:
(g_desktop_app_info_new_from_filename):
Don't leak GKeyFile
2008-01-22 Alexander Larsson <alexl@redhat.com> 2008-01-22 Alexander Larsson <alexl@redhat.com>
* glocalfileinfo.c (get_thumbnail_attributes): * glocalfileinfo.c (get_thumbnail_attributes):

10
gio/gdesktopappinfo.c
View File

@ -186,12 +186,16 @@ g_desktop_app_info_new_from_filename (const char *filename)
filename, filename,
G_KEY_FILE_NONE, G_KEY_FILE_NONE,
NULL)) NULL))
return NULL; {
g_key_file_free (key_file);
return NULL;
}
start_group = g_key_file_get_start_group (key_file); start_group = g_key_file_get_start_group (key_file);
if (start_group == NULL || strcmp (start_group, G_KEY_FILE_DESKTOP_GROUP) != 0) if (start_group == NULL || strcmp (start_group, G_KEY_FILE_DESKTOP_GROUP) != 0)
{ {
g_free (start_group); g_free (start_group);
g_key_file_free (key_file);
return NULL; return NULL;
} }
g_free (start_group); g_free (start_group);
@ -203,6 +207,7 @@ g_desktop_app_info_new_from_filename (const char *filename)
if (type == NULL || strcmp (type, G_KEY_FILE_DESKTOP_TYPE_APPLICATION) != 0) if (type == NULL || strcmp (type, G_KEY_FILE_DESKTOP_TYPE_APPLICATION) != 0)
{ {
g_free (type); g_free (type);
g_key_file_free (key_file);
return NULL; return NULL;
} }
g_free (type); g_free (type);
@ -218,6 +223,7 @@ g_desktop_app_info_new_from_filename (const char *filename)
if (t == NULL) if (t == NULL)
{ {
g_free (try_exec); g_free (try_exec);
g_key_file_free (key_file);
return NULL; return NULL;
} }
g_free (t); g_free (t);
@ -239,6 +245,8 @@ g_desktop_app_info_new_from_filename (const char *filename)
info->startup_notify = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY, NULL) != FALSE; info->startup_notify = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY, NULL) != FALSE;
info->hidden = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_HIDDEN, NULL) != FALSE; info->hidden = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_HIDDEN, NULL) != FALSE;
g_key_file_free (key_file);
info->icon = NULL; info->icon = NULL;
if (info->icon_name) if (info->icon_name)
{ {