diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2017-06-21 13:08:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-21 13:08:45 +0100 |
| commit | fa94875295bbd7a4afa0f7724e77dcff8cd3adab (patch) | |
| tree | 158e46c61fc00faba637fede68202e5c8877fb2f | |
| parent | 40294f38e168e62d2d7cebf6266df472287889a8 (diff) | |
| parent | 4dc87e72303dd42363597bbb1963de80fa602bff (diff) | |
| download | libgit2-fa94875295bbd7a4afa0f7724e77dcff8cd3adab.tar.gz | |
Merge pull request #4277 from pks-t/pks/merge-coverity-fix
merge: fix potential free of uninitialized memory
| -rw-r--r-- | src/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index 5d69d9b15..e6fa7dca7 100644 --- a/src/merge.c +++ b/src/merge.c @@ -1165,7 +1165,7 @@ static int merge_diff_mark_similarity_exact( { size_t i, j; git_merge_diff *conflict_src, *conflict_tgt; - git_oidmap *ours_deletes_by_oid, *theirs_deletes_by_oid; + git_oidmap *ours_deletes_by_oid = NULL, *theirs_deletes_by_oid = NULL; int error = 0; if (!(ours_deletes_by_oid = git_oidmap_alloc()) || |