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.
Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
---
merge-recursive.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index e95eac2c70..cdd0afa047 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)
--
2.15.0.408.g850bc54b15
