mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-02 22:11:54 +02:00
Code Releases Activity

49653: fix array indexing issue introduced with 49518 due to using decimal rather than hex 20

Browse source 
Also avoid comparing the current word against all options when the word
doesn't start with - or +.
This commit is contained in:
Oliver Kiddle 2021-12-16 14:27:59 +01:00
parent 702d773e86
commit 6b763233b2
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2021-12-16 Oliver Kiddle <opk@zsh.org>
* 49653: Src/Zle/computil.c: fix array indexing issue introduced
with 49518 due to using decimal rather than hex 20
* 49648 based on github #80 (Vincent Bernat):
Completion/Unix/Command/_find, Completion/Zsh/Type/_globquals:
invert before/since for date glob qualifiers completion

8
Src/Zle/computil.c
View file

@ -1088,10 +1088,10 @@ bslashcolon(char *s)
static int
single_index(char pre, char opt)
{
if (opt <= 20 || opt > 0x7e)
if (opt <= 0x20 || opt > 0x7e)
return -1;
return opt + (pre == '-' ? -21 : 94 - 21);
return opt + (pre == '-' ? -0x21 : 94 - 0x21);
}
/* Parse an argument definition. */
@ -2158,7 +2158,8 @@ ca_parse_line(Cadef d, Cadef all, int multi, int first)
/* See if it's an option. */
if (state.opt == 2 && (state.curopt = ca_get_opt(d, line, 0, &pe)) &&
if (state.opt == 2 && (*line == '-' || *line == '+') &&
(state.curopt = ca_get_opt(d, line, 0, &pe)) &&
(state.curopt->type == CAO_OEQUAL ?
(compwords[cur] || pe[-1] == '=') :
(state.curopt->type == CAO_EQUAL ?
@ -2206,6 +2207,7 @@ ca_parse_line(Cadef d, Cadef all, int multi, int first)
state.curopt = NULL;
}
} else if (state.opt == 2 && d->single &&
(*line == '-' || *line == '+') &&
((state.curopt = ca_get_sopt(d, line, &pe, &sopts)) ||
(cur != compcurrent && sopts && nonempty(sopts)))) {
/* Or maybe it's a single-letter option? */