Re: [PATCH 69/83] builtin/apply: make add_conflicted_stages_file() return -1 on error
From: Eric Sunshine <hidden>
Date: 2016-06-16 02:19:07
On Sun, Apr 24, 2016 at 9:34 AM, Christian Couder [off-list ref] wrote:
quoted hunk ↗ jump to hunk
Signed-off-by: Christian Couder <redacted> ---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)?
} + + return 0; }