mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-04-09 09:30:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

common/dir: Fix various big and small leaks

Browse Source 
Some of these were leaking entire file contents, or the whole of
xa.metadata.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Closes: #1259
Approved by: mwleeds

(cherry picked from commit 955fbc29bf)
This commit is contained in:
Philip Withnall
2017-12-15 19:51:45 +00:00
committed by Alexander Larsson
parent 7ac1e3d130
commit 45fa73efa6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/flatpak-dir.c
View File

@@ -5229,7 +5229,7 @@ flatpak_dir_deploy (FlatpakDir *self,
g_autoptr(GFile) tmp_dir_template = NULL;
g_autoptr(GVariant) commit_data = NULL;
g_autofree char *tmp_dir_path = NULL;
g_autofree char *alt_id = NULL;
const char *alt_id = NULL;
const char *xa_metadata = NULL;
const char *xa_ref = NULL;
g_autofree char *checkout_basename = NULL;
@@ -5279,7 +5279,7 @@ flatpak_dir_deploy (FlatpakDir *self,
return FALSE;
commit_metadata = g_variant_get_child_value (commit_data, 0);
g_variant_lookup (commit_metadata, "xa.alt-id", "s", &alt_id);
g_variant_lookup (commit_metadata, "xa.alt-id", "&s", &alt_id);
checkout_basename = flatpak_dir_get_deploy_subdir (self, checksum, subpaths);
@@ -5408,7 +5408,7 @@ flatpak_dir_deploy (FlatpakDir *self,
}
}
g_variant_lookup (commit_metadata, "xa.ref", "s", &xa_ref);
g_variant_lookup (commit_metadata, "xa.ref", "&s", &xa_ref);
if (xa_ref != NULL)
{
gboolean gpg_verify_summary;
@@ -5481,11 +5481,11 @@ flatpak_dir_deploy (FlatpakDir *self,
/* Check the metadata in the commit to make sure it matches the actual
deployed metadata, in case we relied on the one in the commit for
a decision */
g_variant_lookup (commit_metadata, "xa.metadata", "s", &xa_metadata);
g_variant_lookup (commit_metadata, "xa.metadata", "&s", &xa_metadata);
if (xa_metadata != NULL)
{
g_autoptr(GFile) metadata_file = g_file_resolve_relative_path (checkoutdir, "metadata");
char *metadata_contents;
g_autofree char *metadata_contents = NULL;
if (!g_file_load_contents (metadata_file, NULL,
&metadata_contents, NULL, NULL, NULL) ||