ahill/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-01-26 14:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid critical error in remote-info command

Browse Source 
Without this patch, the remote-info command will sometimes emit a
critical error "g_utf8_strlen: assertion 'p != NULL || max == 0' failed"
and print (null) for the "Commit:" field, since the commit doesn't get
initialized properly.
This commit is contained in:
Phaedrus Leeds 2020-09-11 18:17:10 -07:00 committed by Alexander Larsson
parent d8086141fb
commit 238317d99b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/flatpak-dir.c
View File

@ -991,14 +991,14 @@ flatpak_remote_state_load_ref_commit (FlatpakRemoteState *self,
/* First try local availability */
if (ostree_repo_load_commit (dir->repo, commit, &commit_data, NULL, NULL))
return g_steal_pointer (&commit_data);
goto out;
for (int i = 0; i < self->sideload_repos->len; i++)
{
FlatpakSideloadState *ss = g_ptr_array_index (self->sideload_repos, i);
if (ostree_repo_load_commit (ss->repo, commit, &commit_data, NULL, NULL))
return g_steal_pointer (&commit_data);
goto out;
}
if (flatpak_dir_get_remote_oci (dir, self->remote_name))
@ -1008,6 +1008,7 @@ flatpak_remote_state_load_ref_commit (FlatpakRemoteState *self,
commit_data = flatpak_remote_state_fetch_commit_object (self, dir, ref, commit, token,
cancellable, error);
out:
if (out_commit)
*out_commit = g_steal_pointer (&commit);