From: Christian Couder <christian.couder@gmail.com>
Date: Sun, 01 May 2016 19:51:56 GMT
Subject: Re: [PATCH 54/83] builtin/apply: make parse_chunk() return a negative integer on error
Message-ID: <CAP8UFD0U1eBGYsVdNovhAGJzc1L=svDpkunTmTGboKmxhFF5Ow@mail.gmail.com>
In-Reply-To: <CAPig+cQbF_Xq2oB5ALQkj_Zdw8VR8kyVyinq_K24zGGK7Xundw@mail.gmail.com>

On Sun, May 1, 2016 at 9:04 PM, Eric Sunshine <sunshine@sunshineco.com> wrote:
> On Sun, Apr 24, 2016 at 9:33 AM, Christian Couder
> <christian.couder@gmail.com> wrote:
>> This negative number can be -2 if no patch header has been found,
>> otherwise it is -1.
>>
>> As parse_chunk() is called only by apply_patch() which already
>> returns -1 when an error happened, let's make it return -1 when
>> parse_chunk() returns -1.
>>
>> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
>> ---
>> diff --git a/builtin/apply.c b/builtin/apply.c
>> @@ -4566,6 +4567,8 @@ static int apply_patch(struct apply_state *state,
>>                 nr = parse_chunk(state, buf.buf + offset, buf.len - offset, patch);
>>                 if (nr < 0) {
>>                         free_patch(patch);
>> +                       if (nr == -1)
>> +                               return -1;
>
> Same comment as 51/83 about this leaking 'list', 'buf', and 'fn_table'.

Ok, thanks!