diff options
| author | Jeff King <peff@peff.net> | 2017-04-20 17:09:35 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-20 21:04:34 -0700 |
| commit | 16d2676c9ee996208277772fdf81dda212355440 (patch) | |
| tree | 74af8cd55456aa59bcc75fe4bfa715583461bc48 | |
| parent | 8c2ca3a6d6d0bf51332f92d25b7902f9943aaaf2 (diff) | |
| download | git-16d2676c9ee996208277772fdf81dda212355440.tar.gz git-16d2676c9ee996208277772fdf81dda212355440.tar.xz | |
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@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/am.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/builtin/am.c b/builtin/am.c index 31fb60578..7a6cf9533 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) |