| commit | 9622f8af8c337f097661a0f476de5b665d74b853 | |
| author | Elijah Newren <newren@gmail.com> | |
| Wed, 14 Feb 2018 18:51:51 +0000 (14 10:51 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Feb 2018 21:02:52 +0000 (14 13:02 -0800) | ||
| tree | be3cb443f4e568750a981f2f6ade8af615fb8752 | treesnapshot (tar.gz zip) |
| parent | 2dd6f8aa8495d30c9b16ed361c0b280bbed4bc14 | commitdiff |
merge-recursive: fix leaks of allocated renames and diff_filepairs
get_renames() has always zero'ed out diff_queued_diff.nr while only
manually free'ing diff_filepairs that did not correspond to renames.
Further, it allocated struct renames that were tucked away in the
return string_list. Make sure all of these are deallocated when we
are done with them.
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
get_renames() has always zero'ed out diff_queued_diff.nr while only
manually free'ing diff_filepairs that did not correspond to renames.
Further, it allocated struct renames that were tucked away in the
return string_list. Make sure all of these are deallocated when we
are done with them.
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-recursive.c | diffblobblamehistory |