diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2021-03-04 09:20:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-04 09:20:34 +0000 |
| commit | b33e018cab1faf95208556cb54ae16b6c7449552 (patch) | |
| tree | f73247bd7d19bcb3a6455be31ffeca7c32028e05 | |
| parent | 80bdeca4bd1a737ea01e1f9c6f51f88bfdd8695c (diff) | |
| parent | dc1095a5b7a1c17a11d9bc70a93c2191d78f4c18 (diff) | |
| download | libgit2-b33e018cab1faf95208556cb54ae16b6c7449552.tar.gz | |
Merge pull request #5818 from mamapanda/patch-3
merge: Check insert_head_ids error in create_virtual_base
| -rw-r--r-- | src/merge.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/merge.c b/src/merge.c index e02ea9169..82b028b4a 100644 --- a/src/merge.c +++ b/src/merge.c @@ -2277,8 +2277,11 @@ static int create_virtual_base( result->type = GIT_ANNOTATED_COMMIT_VIRTUAL; result->index = index; - insert_head_ids(&result->parents, one); - insert_head_ids(&result->parents, two); + if (insert_head_ids(&result->parents, one) < 0 || + insert_head_ids(&result->parents, two) < 0) { + git_annotated_commit_free(result); + return -1; + } *out = result; return 0; |