kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

am: don't pass strvec to apply_parse_options() 

apply_parse_options() passes the array of argument strings to
parse_options(), which removes recognized options.  The removed strings
are not freed, though.

Make a copy of the strvec to pass to the function to retain the pointers
of its strings, so we release them all at the end.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
René Scharfe 2022-12-13 07:47:59 +01:00 committed by Junio C Hamano
parent 8706a59933
commit a658e881c1
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/am.c
View File

@ -1476,6 +1476,7 @@ static int run_apply(const struct am_state *state, const char *index_file)
int res, opts_left; int res, opts_left;
int force_apply = 0; int force_apply = 0;
int options = 0; int options = 0;
const char **apply_argv;


if (init_apply_state(&apply_state, the_repository, NULL)) if (init_apply_state(&apply_state, the_repository, NULL))
BUG("init_apply_state() failed"); BUG("init_apply_state() failed");
@ -1483,7 +1484,15 @@ static int run_apply(const struct am_state *state, const char *index_file)
strvec_push(&apply_opts, "apply"); strvec_push(&apply_opts, "apply");
strvec_pushv(&apply_opts, state->git_apply_opts.v); strvec_pushv(&apply_opts, state->git_apply_opts.v);


opts_left = apply_parse_options(apply_opts.nr, apply_opts.v, /*
* Build a copy that apply_parse_options() can rearrange.
* apply_opts.v keeps referencing the allocated strings for
* strvec_clear() to release.
*/
ALLOC_ARRAY(apply_argv, apply_opts.nr);
COPY_ARRAY(apply_argv, apply_opts.v, apply_opts.nr);

opts_left = apply_parse_options(apply_opts.nr, apply_argv,
&apply_state, &force_apply, &options, &apply_state, &force_apply, &options,
NULL); NULL);


@ -1513,6 +1522,7 @@ static int run_apply(const struct am_state *state, const char *index_file)
strvec_clear(&apply_paths); strvec_clear(&apply_paths);
strvec_clear(&apply_opts); strvec_clear(&apply_opts);
clear_apply_state(&apply_state); clear_apply_state(&apply_state);
free(apply_argv);


if (res) if (res)
return res; return res;