Web lists-archives.com

[PATCH 6/6] am: drop "dir" parameter from am_state_init

The only caller of this function passes in a static buffer
returned from git_path(). This looks dangerous at first
glance, but turns out to be OK because the first thing we do
is xstrdup() the result.

Let's turn this into a git_pathdup(). That's slightly more
efficient (no extra copy), and makes it easier to audit for
dangerous git_path() invocations.

Since there's only a single caller, let's just set this
default path inside the init function. That makes the memory
ownership clear.

Signed-off-by: Jeff King <peff@xxxxxxxx>
 builtin/am.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/builtin/am.c b/builtin/am.c
index f7a7a971f..97849d4dc 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -134,17 +134,15 @@ struct am_state {
- * Initializes am_state with the default values. The state directory is set to
- * dir.
+ * Initializes am_state with the default values.
-static void am_state_init(struct am_state *state, const char *dir)
+static void am_state_init(struct am_state *state)
 	int gpgsign;
 	memset(state, 0, sizeof(*state));
-	assert(dir);
-	state->dir = xstrdup(dir);
+	state->dir = git_pathdup("rebase-apply");
 	state->prec = 4;
@@ -2322,7 +2320,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 	git_config(git_am_config, NULL);
-	am_state_init(&state, git_path("rebase-apply"));
+	am_state_init(&state);
 	in_progress = am_in_progress(&state);
 	if (in_progress)