diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-02-15 01:15:56 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-02-15 01:15:56 +0300 |
commit | 7ac5eca21cd14f56cd7f29f72e9af94e40ed4ee1 (patch) | |
tree | 2477837467f213ab05514d2f1357227b726c4353 /builtin | |
parent | b7a7af266bdf2796385fb626de059ab7a61a80be (diff) | |
parent | a658e881c138c8bc398d1d4b9b6db9e29b16673c (diff) |
Merge branch 'rs/am-parse-options-cleanup' into maint-2.39
Code clean-up.
* rs/am-parse-options-cleanup:
am: don't pass strvec to apply_parse_options()
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/am.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c index 30c9b3a9cd..dddf1b9af0 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1476,6 +1476,7 @@ static int run_apply(const struct am_state *state, const char *index_file) int res, opts_left; int force_apply = 0; int options = 0; + const char **apply_argv; if (init_apply_state(&apply_state, the_repository, NULL)) 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_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, 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_opts); clear_apply_state(&apply_state); + free(apply_argv); if (res) return res; |