undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am: drop "dir" parameter from am_state_init

Browse Source 
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>
This commit is contained in:
Jeff King 2017-04-20 17:09:35 -04:00 committed by Junio C Hamano
parent 8c2ca3a6d6
commit 16d2676c9e
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/am.c
View File

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