diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2014-06-10 23:52:38 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2014-06-10 23:52:38 -0700 |
| commit | d1da134c6327f8099fed3462beaf6a0a501e499b (patch) | |
| tree | ee57fbd4210fa6468555fdb2990f701c2f6460df | |
| parent | e1fbf76de0b7682ed0f66883073037fee581e316 (diff) | |
| download | zsh-d1da134c6327f8099fed3462beaf6a0a501e499b.tar.gz zsh-d1da134c6327f8099fed3462beaf6a0a501e499b.tar.xz zsh-d1da134c6327f8099fed3462beaf6a0a501e499b.zip | |
32766: bracechardots() agrees with xpandbraces() about what constitutes a {C1..C2} pattern, thus preventing crash
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/glob.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index f4fac3142..af357ac93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 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 2014-06-09 Peter Stephenson <p.stephenson@samsung.com> diff --git a/Src/glob.c b/Src/glob.c index 6403e46f7..f6ae7aa41 100644 --- a/Src/glob.c +++ b/Src/glob.c @@ -2122,6 +2122,8 @@ bracechardots(char *str, convchar_t *c1p, convchar_t *c2p) convchar_t cstart, cend; char *pnext = str + 1, *pconv, convstr[2]; if (itok(*pnext)) { + if (*pnext == Inbrace) + return 0; convstr[0] = ztokens[*pnext - Pound]; convstr[1] = '\0'; pconv = convstr; |