Skip to content

Commit 41211db

Browse files
avargitster
authored andcommitted
builtin/merge.c: free "&buf" on "Your local changes..." error
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. e4cdfe8 (merge: abort if index does not match HEAD for trivial merges, 2022-07-23) 2. d5a35c1 (Copy resolve_ref() return value for longer use, 2011-11-13) Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 345e216 commit 41211db

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

builtin/merge.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1618,7 +1618,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
16181618
error(_("Your local changes to the following files would be overwritten by merge:\n %s"),
16191619
sb.buf);
16201620
strbuf_release(&sb);
1621-
return 2;
1621+
ret = 2;
1622+
goto done;
16221623
}
16231624

16241625
/* See if it is really trivial. */

0 commit comments

Comments
 (0)