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

32766: bracechardots() agrees with xpandbraces() about what constitutes a {C1..C2} pattern, thus preventing crash

Browse source
This commit is contained in:
Barton E. Schaefer 2014-06-10 23:52:38 -07:00
parent e1fbf76de0
commit d1da134c63
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2014-06-10 Barton E. Schaefer <schaefer@zsh.org> 2014-06-10 Barton E. Schaefer <schaefer@zsh.org>
* 32766: Src/glob.c: bracechardots() agrees with xpandbraces()
about what constitutes a {C1..C2} pattern, thus preventing crash
* Jun T: 32765: Src/glob.c: fix build when not MULTIBYTE_SUPPORT * Jun T: 32765: Src/glob.c: fix build when not MULTIBYTE_SUPPORT
2014-06-09 Peter Stephenson <p.stephenson@samsung.com> 2014-06-09 Peter Stephenson <p.stephenson@samsung.com>

2
Src/glob.c
View file

@ -2122,6 +2122,8 @@ bracechardots(char *str, convchar_t *c1p, convchar_t *c2p)
convchar_t cstart, cend; convchar_t cstart, cend;
char *pnext = str + 1, *pconv, convstr[2]; char *pnext = str + 1, *pconv, convstr[2];
if (itok(*pnext)) { if (itok(*pnext)) {
if (*pnext == Inbrace)
return 0;
convstr[0] = ztokens[*pnext - Pound]; convstr[0] = ztokens[*pnext - Pound];
convstr[1] = '\0'; convstr[1] = '\0';
pconv = convstr; pconv = convstr;