summaryrefslogtreecommitdiff
path: root/include/git2
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2017-06-21 13:35:46 +0200
committerPatrick Steinhardt <ps@pks.im>2017-06-21 13:35:46 +0200
commit4dc87e72303dd42363597bbb1963de80fa602bff (patch)
tree158e46c61fc00faba637fede68202e5c8877fb2f /include/git2
parent40294f38e168e62d2d7cebf6266df472287889a8 (diff)
downloadlibgit2-4dc87e72303dd42363597bbb1963de80fa602bff.tar.gz
merge: fix potential free of uninitialized memory
The function `merge_diff_mark_similarity_exact` may error our early and, when it does so, free the `ours_deletes_by_oid` and `theirs_deletes_by_oid` variables. While the first one can never be uninitialized due to the first call actually assigning to it, the second variable can be freed without being initialized. Fix the issue by initializing both variables to `NULL`.
Diffstat (limited to 'include/git2')
0 files changed, 0 insertions, 0 deletions