about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Src/glob.c2
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;