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

Merge branch 'ab/fix-strategy-opts-parsing' 

The code to parse "git rebase -X<opt>" was not prepared to see an
unparsable option string, which has been corrected.

* ab/fix-strategy-opts-parsing:
  sequencer.c: fix overflow & segfault in parse_strategy_opts()
maint
Junio C Hamano 2023-03-19 15:03:12 -07:00
parent 0717a424a7 15a4cc912e
commit fc1a4ce043
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sequencer.c
View File

@ -2919,13 +2919,18 @@ static int populate_opts_cb(const char *key, const char *value, void *data)
void parse_strategy_opts(struct replay_opts *opts, char *raw_opts) void parse_strategy_opts(struct replay_opts *opts, char *raw_opts)
{ {
int i; int i;
int count;
char *strategy_opts_string = raw_opts; char *strategy_opts_string = raw_opts;


if (*strategy_opts_string == ' ') if (*strategy_opts_string == ' ')
strategy_opts_string++; strategy_opts_string++;


opts->xopts_nr = split_cmdline(strategy_opts_string, count = split_cmdline(strategy_opts_string,
(const char ***)&opts->xopts); (const char ***)&opts->xopts);
if (count < 0)
die(_("could not split '%s': %s"), strategy_opts_string,
split_cmdline_strerror(count));
opts->xopts_nr = count;
for (i = 0; i < opts->xopts_nr; i++) { for (i = 0; i < opts->xopts_nr; i++) {
const char *arg = opts->xopts[i]; const char *arg = opts->xopts[i];



18
t/t3436-rebase-more-options.sh
View File

@ -40,6 +40,24 @@ test_expect_success 'setup' '
EOF EOF
' '


test_expect_success 'bad -X <strategy-option> arguments: unclosed quote' '
cat >expect <<-\EOF &&
fatal: could not split '\''--bad'\'': unclosed quote
EOF
test_expect_code 128 git rebase -X"bad argument\"" side main >out 2>actual &&
test_must_be_empty out &&
test_cmp expect actual
'

test_expect_success 'bad -X <strategy-option> arguments: bad escape' '
cat >expect <<-\EOF &&
fatal: could not split '\''--bad'\'': cmdline ends with \
EOF
test_expect_code 128 git rebase -X"bad escape \\" side main >out 2>actual &&
test_must_be_empty out &&
test_cmp expect actual
'

test_expect_success '--ignore-whitespace works with apply backend' ' test_expect_success '--ignore-whitespace works with apply backend' '
test_must_fail git rebase --apply main side && test_must_fail git rebase --apply main side &&
git rebase --abort && git rebase --abort &&