mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-03-06 16:20:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

flatpak-dir: Fix crash on updating app with no deploy data or subpaths

Browse Source 
If an app had no deploy data, and `flatpak_dir_update()` was called with
`opt_subpaths == NULL`, then `arg_subpaths` passed to
`flatpak_dir_system_helper_call_deploy()` would be `NULL`, which causes
an assertion failure from an internal `g_variant_new()` call:
```
g_variant_new_strv: assertion 'length == 0 || strv != NULL' failed
```

Fix that by setting the `subpaths` to an empty array if nothing else is
specified.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall
2021-01-20 21:40:39 +00:00
parent b8d8e5bf04
commit e274bafc01
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/flatpak-dir.c
View File

@@ -9684,6 +9684,7 @@ flatpak_dir_update (FlatpakDir *self,
{
g_autoptr(GBytes) deploy_data = NULL;
const char **subpaths = NULL;
const char *empty_subpaths[] = {NULL};
g_autofree char *url = NULL;
FlatpakPullFlags flatpak_flags;
g_autofree const char **old_subpaths = NULL;
@@ -9706,8 +9707,10 @@ flatpak_dir_update (FlatpakDir *self,
if (opt_subpaths)
subpaths = opt_subpaths;
else
else if (old_subpaths)
subpaths = old_subpaths;
else
subpaths = empty_subpaths;
if (!ostree_repo_remote_get_url (self->repo, state->remote_name, &url, error))
return FALSE;