[PATCH v4 14/19] builtin/merge.c: free "&buf" on "Your local changes..." error

From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Jan 17, 2023, 17:11 UTC
Message-ID: <patch-v4-14.19-e8ea18b08c2-20230117T151202Z-avarab@gmail.com>
In-Reply-To: <cover-v4-00.19-00000000000-20230117T151201Z-avarab@gmail.com>

Plug a memory leak introduced in [1], since that change didn't follow the "goto done" pattern introduced in [2] we'd leak the "&buf" memory.

1. e4cdfe84a0d (merge: abort if index does not match HEAD for trivial
   merges, 2022-07-23)
2. d5a35c114ab (Copy resolve_ref() return value for longer use,
   2011-11-13)

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 builtin/merge.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/builtin/merge.c b/builtin/merge.c
index 91dd5435c59..2b13124c497 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1618,7 +1618,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 				error(_("Your local changes to the following files would be overwritten by merge:\n  %s"),
 				      sb.buf);
 				strbuf_release(&sb);
-				return 2;
+				ret = 2;
+				goto done;
 			}
 
 			/* See if it is really trivial. */

-- 
2.39.0.1225.g30a3d88132d