diff options
| author | Kevin Willford <kewillf@microsoft.com> | 2017-08-28 14:28:27 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-06 13:10:20 +0900 |
| commit | e336bdc5b9bcb62982da9708dfb6e68150de72a3 (patch) | |
| tree | f7056c81e03690e81af9d50b6b1cfb8170eed733 /merge-recursive.h | |
| parent | edc74bc7f0c6884027e851ef09b2e0c9380dcd45 (diff) | |
| download | git-e336bdc5b9bcb62982da9708dfb6e68150de72a3.tar.gz git-e336bdc5b9bcb62982da9708dfb6e68150de72a3.tar.xz | |
merge-recursive: fix memory leak
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 <kewillf@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions