Commit d4fe402b0523a3065fbe6c7c2d3ae5a208eb18e4
2019-08-08T10:36:33
merge: check return value of `git_commit_list_insert` The function `git_commit_list_insert` dynamically allocates memory and may thus fail to insert a given commit, but we didn't check for that in several places in "merge.c". Convert surrounding functions to return error codes and check whether `git_commit_list_insert` was successful, returning an error if not.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98
diff --git a/src/merge.c b/src/merge.c
index c1f1cc4..657b018 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -310,46 +310,55 @@ static int interesting(git_pqueue *list)
return 0;
}
-static void clear_commit_marks_1(git_commit_list **plist,
+static int clear_commit_marks_1(git_commit_list **plist,
git_commit_list_node *commit, unsigned int mark)
{
while (commit) {
unsigned int i;
if (!(mark & commit->flags))
- return;
+ return 0;
commit->flags &= ~mark;
for (i = 1; i < commit->out_degree; i++) {
git_commit_list_node *p = commit->parents[i];
- git_commit_list_insert(p, plist);
+ if (git_commit_list_insert(p, plist) == NULL)
+ return -1;
}
commit = commit->out_degree ? commit->parents[0] : NULL;
}
+
+ return 0;
}
-static void clear_commit_marks_many(git_vector *commits, unsigned int mark)
+static int clear_commit_marks_many(git_vector *commits, unsigned int mark)
{
git_commit_list *list = NULL;
git_commit_list_node *c;
unsigned int i;
git_vector_foreach(commits, i, c) {
- git_commit_list_insert(c, &list);
+ if (git_commit_list_insert(c, &list) == NULL)
+ return -1;
}
while (list)
- clear_commit_marks_1(&list, git_commit_list_pop(&list), mark);
+ if (clear_commit_marks_1(&list, git_commit_list_pop(&list), mark) < 0)
+ return -1;
+ return 0;
}
-static void clear_commit_marks(git_commit_list_node *commit, unsigned int mark)
+static int clear_commit_marks(git_commit_list_node *commit, unsigned int mark)
{
git_commit_list *list = NULL;
- git_commit_list_insert(commit, &list);
+ if (git_commit_list_insert(commit, &list) == NULL)
+ return -1;
while (list)
- clear_commit_marks_1(&list, git_commit_list_pop(&list), mark);
+ if (clear_commit_marks_1(&list, git_commit_list_pop(&list), mark) < 0)
+ return -1;
+ return 0;
}
static int paint_down_to_common(
@@ -466,10 +475,11 @@ static int remove_redundant(git_revwalk *walk, git_vector *commits)
redundant[filled_index[j]] = 1;
}
- clear_commit_marks(commit, ALL_FLAGS);
- clear_commit_marks_many(&work, ALL_FLAGS);
-
git_commit_list_free(&common);
+
+ if ((error = clear_commit_marks(commit, ALL_FLAGS)) < 0 ||
+ (error = clear_commit_marks_many(&work, ALL_FLAGS)) < 0)
+ goto done;
}
for (i = 0; i < commits->length; ++i) {
@@ -531,10 +541,9 @@ int git_merge__bases_many(git_commit_list **out, git_revwalk *walk, git_commit_l
while (result)
git_vector_insert(&redundant, git_commit_list_pop(&result));
- clear_commit_marks(one, ALL_FLAGS);
- clear_commit_marks_many(twos, ALL_FLAGS);
-
- if ((error = remove_redundant(walk, &redundant)) < 0) {
+ if ((error = clear_commit_marks(one, ALL_FLAGS)) < 0 ||
+ (error = clear_commit_marks_many(twos, ALL_FLAGS)) < 0 ||
+ (error = remove_redundant(walk, &redundant)) < 0) {
git_vector_free(&redundant);
return error;
}