diff options
| author | Elijah Newren <newren@gmail.com> | 2018-02-14 18:51:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-14 21:02:52 (GMT) |
| commit | 9622f8af8c337f097661a0f476de5b665d74b853 (patch) | |
| tree | be3cb443f4e568750a981f2f6ade8af615fb8752 /merge-recursive.c | |
| parent | 2dd6f8aa8495d30c9b16ed361c0b280bbed4bc14 (diff) | |
| download | git-9622f8af8c337f097661a0f476de5b665d74b853.zip git-9622f8af8c337f097661a0f476de5b665d74b853.tar.gz git-9622f8af8c337f097661a0f476de5b665d74b853.tar.bz2 | |
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>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 35c0470..c24b8f3 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1653,13 +1653,23 @@ static int handle_renames(struct merge_options *o, return process_renames(o, ri->head_renames, ri->merge_renames); } -static void cleanup_renames(struct rename_info *re_info) +static void cleanup_rename(struct string_list *rename) { - string_list_clear(re_info->head_renames, 0); - string_list_clear(re_info->merge_renames, 0); + const struct rename *re; + int i; - free(re_info->head_renames); - free(re_info->merge_renames); + for (i = 0; i < rename->nr; i++) { + re = rename->items[i].util; + diff_free_filepair(re->pair); + } + string_list_clear(rename, 1); + free(rename); +} + +static void cleanup_renames(struct rename_info *re_info) +{ + cleanup_rename(re_info->head_renames); + cleanup_rename(re_info->merge_renames); } static struct object_id *stage_oid(const struct object_id *oid, unsigned mode) |