From ab4bcc038aebb68975935809cd328fc9ccb70ba7 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Wed, 22 Jan 2014 14:14:37 -0800 Subject: [PATCH] Plug a small memory leak --- src/checkout.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/checkout.c b/src/checkout.c index 962929075..6769cbc3d 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -753,8 +753,11 @@ static int checkout_conflicts_load(checkout_data *data, git_iterator *workdir, g conflict->theirs = theirs; if ((error = checkout_conflict_detect_submodule(conflict)) < 0 || - (error = checkout_conflict_detect_binary(data->repo, conflict)) < 0) + (error = checkout_conflict_detect_binary(data->repo, conflict)) < 0) + { + git__free(conflict); goto done; + } git_vector_insert(&data->conflicts, conflict); }