From: Phillip Wood <phillip.wood@dunelm.org.uk>
Date: Thu, 18 Apr 2024 13:14:05 +0000 (+0100)
Subject: sequencer: always free "struct replay_opts"
X-Git-Tag: v2.46.0-rc0~163^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42aae6a49af1be6108c3133af881cb9429aa3d35;p=thirdparty%2Fgit.git

sequencer: always free "struct replay_opts"

sequencer_post_commit_cleanup() initializes an instance of "struct
replay_opts" but does not call replay_opts_release(). Currently this
does not leak memory because the code paths called don't allocate any of
the struct members. That will change in the next commit so add call to
replay_opts_release() to prevent a memory leak in "git commit" that
breaks all of the leak free tests.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/sequencer.c b/sequencer.c
index f49a871ac0..e4146b4cdf 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -2823,12 +2823,14 @@ void sequencer_post_commit_cleanup(struct repository *r, int verbose)
 			NULL, REF_NO_DEREF);
 
 	if (!need_cleanup)
-		return;
+		goto out;
 
 	if (!have_finished_the_last_pick())
-		return;
+		goto out;
 
 	sequencer_remove_state(&opts);
+out:
+	replay_opts_release(&opts);
 }
 
 static void todo_list_write_total_nr(struct todo_list *todo_list)