about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2002-01-22 13:52:29 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2002-01-22 13:52:29 +0000
commit803131605b894f12da34b90e59b571a775c2b3fa (patch)
treec2b575bf22ab3ed47d91f18139af4d4efae8c8b3
parent13b57311def75963aa73892660687252c38ce183 (diff)
downloadzsh-803131605b894f12da34b90e59b571a775c2b3fa.tar.gz
zsh-803131605b894f12da34b90e59b571a775c2b3fa.tar.xz
zsh-803131605b894f12da34b90e59b571a775c2b3fa.zip
16487: Src/glob.c: bug in 16486 when a qualifier in a set
consisted only of flags which were handled globally.
-rw-r--r--ChangeLog3
-rw-r--r--Src/glob.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 45ef93034..de95a39c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-01-22  Peter Stephenson  <pws@csr.com>
 
+	* 16487: Src/glob.c: bug in 16486 when a qualifier in a set
+	consisted only of flags which were handled globally.
+
 	* 16486: Doc/Zsh/expn.yo, Src/glob.c, Src/pattern.c:  support
 	(#q...) EXTENDED_GLOB syntax for qualifiers.  May be chained,
 	ignored by pattern matching code.
diff --git a/Src/glob.c b/Src/glob.c
index 76f23cdb6..aa82b91c1 100644
--- a/Src/glob.c
+++ b/Src/glob.c
@@ -1537,7 +1537,7 @@ zglob(LinkList list, LinkNode np, int nountok)
 		newquals->next = quals;
 		quals = qn;
 	    }
-	} else
+	} else if (newquals)
 	    quals = newquals;
     }
     q = parsepat(str);