Re: [PATCH v2 01/20] merge-recursive: fix minor memory leak in error condition

2019-07-29 Thread Derrick Stolee
On 7/26/2019 2:31 PM, Junio C Hamano wrote: > Elijah Newren writes: > >> Returning before freeing the allocated buffer is suboptimal; as with >> elsewhere in the same function, make sure buf gets free'd. > > I do not have a real objection to the patch text, but the above > justification does not

Re: [PATCH v2 01/20] merge-recursive: fix minor memory leak in error condition

2019-07-26 Thread Elijah Newren
On Fri, Jul 26, 2019 at 11:31 AM Junio C Hamano wrote: > > Elijah Newren writes: > > > Returning before freeing the allocated buffer is suboptimal; as with > > elsewhere in the same function, make sure buf gets free'd. > > I do not have a real objection to the patch text, but the above > justific

Re: [PATCH v2 01/20] merge-recursive: fix minor memory leak in error condition

2019-07-26 Thread Junio C Hamano
Elijah Newren writes: > Returning before freeing the allocated buffer is suboptimal; as with > elsewhere in the same function, make sure buf gets free'd. I do not have a real objection to the patch text, but the above justification does not make much sense to me. The original code returned an e

[PATCH v2 01/20] merge-recursive: fix minor memory leak in error condition

2019-07-26 Thread Elijah Newren
Returning before freeing the allocated buffer is suboptimal; as with elsewhere in the same function, make sure buf gets free'd. Signed-off-by: Elijah Newren --- merge-recursive.c | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c ind