Re: [PATCH 1/3] merge-recursive: fix memory leak

2017-08-29 Thread Jeff King
On Mon, Aug 28, 2017 at 02:28:27PM -0600, Kevin Willford wrote: > In merge_trees if process_renames or process_entry returns less > than zero, the method will just return and not free re_merge, > re_head, or entries. > > This change cleans up the allocated variables before returning > to the call

Re: [PATCH 1/3] merge-recursive: fix memory leak

2017-08-28 Thread Ben Peart
On 8/28/2017 4:28 PM, Kevin Willford wrote: In merge_trees if process_renames or process_entry returns less than zero, the method will just return and not free re_merge, re_head, or entries. This change cleans up the allocated variables before returning to the caller. Signed-off-by: Kevin Wil

[PATCH 1/3] merge-recursive: fix memory leak

2017-08-28 Thread Kevin Willford
In merge_trees if process_renames or process_entry returns less than zero, the method will just return and not free re_merge, re_head, or entries. This change cleans up the allocated variables before returning to the caller. Signed-off-by: Kevin Willford --- merge-recursive.c | 12 +---