mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-03-16 22:19:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39 from matthiasclasen/run-error

Browse Source 
Don't leak an error
This commit is contained in:
Alexander Larsson
2015-01-26 13:15:34 +01:00
parent 97747a3e53 45aabf06d9
commit 6cf3a9ecfe
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
xdg-app-builtins-run.c
View File

@@ -242,6 +242,7 @@ xdg_app_builtin_run (int argc, char **argv, GCancellable *cancellable, GError **
gs_free char *default_command = NULL;
gs_free char *runtime_ref = NULL;
gs_free char *app_ref = NULL;
gs_free char *path = NULL;
gs_unref_keyfile GKeyFile *metakey = NULL;
gs_unref_keyfile GKeyFile *runtime_metakey = NULL;
gs_free_error GError *my_error = NULL;
@@ -291,6 +292,9 @@ xdg_app_builtin_run (int argc, char **argv, GCancellable *cancellable, GError **
if (app_deploy == NULL)
goto out;
path = g_file_get_path (app_deploy);
g_debug ("Running application in %s", path);
metadata = g_file_get_child (app_deploy, "metadata");
if (!g_file_load_contents (metadata, cancellable, &metadata_contents, &metadata_size, NULL, error))
goto out;
@@ -315,8 +319,12 @@ xdg_app_builtin_run (int argc, char **argv, GCancellable *cancellable, GError **
if (runtime_deploy == NULL)
goto out;
g_free (path);
path = g_file_get_path (runtime_deploy);
g_debug ("Using runtime in %s", path);
runtime_metadata = g_file_get_child (runtime_deploy, "metadata");
if (g_file_load_contents (runtime_metadata, cancellable, &runtime_metadata_contents, &runtime_metadata_size, NULL, error))
if (g_file_load_contents (runtime_metadata, cancellable, &runtime_metadata_contents, &runtime_metadata_size, NULL, NULL))
{
runtime_metakey = g_key_file_new ();