summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@zsh.org>2017-03-10 10:43:25 +0000
committerPeter Stephenson <pws@zsh.org>2017-03-10 10:43:25 +0000
commitadab02817f005979969405bf64e35ee90b0261fe (patch)
treea403d343a0d9fd104721263cd967d82ea4a0e4a7
parentc09af3516f9673ae2d1bbca1d2f59433bb6fd342 (diff)
downloadzsh-adab02817f005979969405bf64e35ee90b0261fe.tar.gz
zsh-adab02817f005979969405bf64e35ee90b0261fe.zip
40819: Fix IS_DASH test in BRACE_CCL handling
-rw-r--r--ChangeLog4
-rw-r--r--Src/glob.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index da581010a..305be36c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-03-10 Peter Stephenson <p.stephenson@samsung.com>
+
+ * 40819: Src/glob.c: Fix IS_DASH() test in BRACE_CCL handling.
+
2017-03-10 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
* unposted: Src/Modules/tcp.c: silence compiler warnings on Cygwin
diff --git a/Src/glob.c b/Src/glob.c
index 87127e15f..0fcb4e122 100644
--- a/Src/glob.c
+++ b/Src/glob.c
@@ -2395,7 +2395,8 @@ xpandbraces(LinkList list, LinkNode *np)
c2 = ztokens[c2 - STOUC(Pound)];
if ((char) c2 == Meta)
c2 = 32 ^ p[1];
- if (IS_DASH(c1) && lastch >= 0 && p < str2 && lastch <= (int)c2) {
+ if (IS_DASH((char)c1) && lastch >= 0 &&
+ p < str2 && lastch <= (int)c2) {
while (lastch < (int)c2)
ccl[lastch++] = 1;
lastch = -1;