packaging/ostree
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bin/pull: Fix @ override syntax when pulling multiple refs

Browse Source 
Coverity spotted an infloop here since we were incrementing `i++`
instead of `j++`.  But adding a test revealed other bugs - we need
to keep the arrays in sync.

Coverity CID: 1452204

Closes: #1041
Approved by: pwithnall
This commit is contained in:
Colin Walters authored and Atomic Bot committed 2017-08-07 16:10:08 +00:00
1 parent 8eec337fee
commit 48f8f32921
2 files changed
+13 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/ostree/ot-builtin-pull.c
+8 -4
View File
@@ -209,11 +209,13 @@ ostree_builtin_pull (int argc, char **argv, GCancellable *cancellable, GError **
goto out;
if (!override_commit_ids)
override_commit_ids = g_ptr_array_new_with_free_func (g_free);
{
override_commit_ids = g_ptr_array_new_with_free_func (g_free);
/* Backfill */
for (j = 2; j < i; i++)
g_ptr_array_add (override_commit_ids, g_strdup (""));
/* Backfill */
for (j = 2; j < i; j++)
g_ptr_array_add (override_commit_ids, g_strdup (""));
}
g_ptr_array_add (override_commit_ids, g_strdup (override_commit_id));
g_ptr_array_add (refs_to_fetch, g_strndup (argv[i], at - argv[i]));
@@ -221,6 +223,8 @@ ostree_builtin_pull (int argc, char **argv, GCancellable *cancellable, GError **
else
{
g_ptr_array_add (refs_to_fetch, g_strdup (argv[i]));
if (override_commit_ids)
g_ptr_array_add (override_commit_ids, g_strdup (""));
}
}