mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-28 17:10:59 +01:00
Code Releases Activity

40763: count wide characters and Cmatcher pointers more sanely in cfp_matcher_pats(), and count characters in pattern_match() the same way to stay in sync

Browse source 
Might not fix wide-char matching in completion matcher-lists but should
avoid wild pointer crash
This commit is contained in:
Barton E. Schaefer 2017-03-08 21:26:55 -08:00
parent 67d882479b
commit 071017965f
4 changed files with 68 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Src/Zle/computil.c
View file

@ -4465,17 +4465,24 @@ cfp_matcher_pats(char *matcher, char *add)
if (m && m != pcm_err) {
char *tmp;
int al = strlen(add), zl = ztrlen(add), tl, cl;
VARARR(Cmatcher, ms, zl);
VARARR(Cmatcher, ms, zl); /* One Cmatcher per character */
Cmatcher *mp;
Cpattern stopp;
int stopl = 0;
/* zl >= (number of wide characters) is guaranteed */
memset(ms, 0, zl * sizeof(Cmatcher));
for (; m && *add; m = m->next) {
stopp = NULL;
if (!(m->flags & (CMF_LEFT|CMF_RIGHT))) {
if (m->llen == 1 && m->wlen == 1) {
/*
* In this loop and similar loops below we step
* through tmp one (possibly wide) character at a
* time. pattern_match() compares only the first
* character using unmeta_one() so keep in step.
*/
for (tmp = add, tl = al, mp = ms; tl; ) {
if (pattern_match(m->line, tmp, NULL, NULL)) {
if (*mp) {
@ -4485,10 +4492,10 @@ cfp_matcher_pats(char *matcher, char *add)
} else
*mp = m;
}
cl = (*tmp == Meta) ? 2 : 1;
(void) unmeta_one(tmp, &cl);
tl -= cl;
tmp += cl;
mp += cl;
mp++;
}
} else {
stopp = m->line;
@ -4505,10 +4512,10 @@ cfp_matcher_pats(char *matcher, char *add)
} else
*mp = m;
}
cl = (*tmp == Meta) ? 2 : 1;
(void) unmeta_one(tmp, &cl);
tl -= cl;
tmp += cl;
mp += cl;
mp++;
}
} else if (m->llen) {
stopp = m->line;
@ -4531,7 +4538,7 @@ cfp_matcher_pats(char *matcher, char *add)
al = tmp - add;
break;
}
cl = (*tmp == Meta) ? 2 : 1;
(void) unmeta_one(tmp, &cl);
tl -= cl;
tmp += cl;
}