On Mon, May 2, 2016 at 9:36 AM, Eric Sunshine <sunsh...@sunshineco.com> wrote:
> On Sun, Apr 24, 2016 at 9:34 AM, Christian Couder
> <christian.cou...@gmail.com> wrote:
>> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org>
>> ---
>> diff --git a/builtin/apply.c b/builtin/apply.c
>> @@ -4234,8 +4234,11 @@ static void add_conflicted_stages_file(struct
>> apply_state *state,
>> ce->ce_namelen = namelen;
>> hashcpy(ce->sha1, patch->threeway_stage[stage - 1].hash);
>> if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
>> - die(_("unable to add cache entry for %s"),
>> patch->new_name);
>> + return error(_("unable to add cache entry for %s"),
>> + patch->new_name);
>
> Is this leaking 'ce' (which is allocated a few lines above the shown context)?
Yes, thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
