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>
Elijah Newren committed
Apr 19, 2018 at 10:58 UTC
9cfee25a823d972250409b5c8bdfd91d1cdf7edb
1 file changed
+15
-5
merge-recursive.c
+15
-5
@@ -1663,13 +1663,23 @@ static int handle_renames(struct merge_options *o,
1663
return process_renames(o, ri->head_renames, ri->merge_renames);
1664
}
1665
1666
-static void cleanup_renames(struct rename_info *re_info)
1666
+static void cleanup_rename(struct string_list *rename)
1667
{
1668
- string_list_clear(re_info->head_renames, 0);
1669
- string_list_clear(re_info->merge_renames, 0);
1668
+ const struct rename *re;
1669
+ int i;
1670
1671
- free(re_info->head_renames);
1672
- free(re_info->merge_renames);
1671
+ for (i = 0; i < rename->nr; i++) {
1672
+ re = rename->items[i].util;
1673
+ diff_free_filepair(re->pair);
1674
+ }
1675
+ string_list_clear(rename, 1);
1676
+ free(rename);
1677
+}
1678
+
1679
+static void cleanup_renames(struct rename_info *re_info)
1680
+{
1681
+ cleanup_rename(re_info->head_renames);
1682
+ cleanup_rename(re_info->merge_renames);
1683
}
1684
1685
static struct object_id *stage_oid(const struct object_id *oid, unsigned mode)