diff options
| author | Peter Stephenson <pws@zsh.org> | 2013-11-18 16:28:22 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2013-11-18 16:28:22 +0000 |
| commit | 7560ed59f99c770e45f29ae606f5d447245d4acd (patch) | |
| tree | da6fbe7d7a0eb444475c84d858d336719dacc0cb | |
| parent | 8426fc66399bae77f059276d0f9d995a50761e72 (diff) | |
| parent | 12fb09c336f23fdd6539e66380a32c4a86f3527e (diff) | |
| download | zsh-7560ed59f99c770e45f29ae606f5d447245d4acd.tar.gz zsh-7560ed59f99c770e45f29ae606f5d447245d4acd.tar.xz zsh-7560ed59f99c770e45f29ae606f5d447245d4acd.zip | |
Fix merge of ChangeLog
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Src/glob.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 1ceb804cc..26bc3d44e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,9 +3,14 @@ * unposted but see 32012: Doc/help/.cvsignore, Doc/help/.distfiles: were created in the wrong place, so move. +2013-11-18 Barton E. Schaefer <schaefer@zsh.org> + + * 31995: Han Pingtian: Src/glob.c: glob qualifiers cannot + follow an empty pattern, so a leading paren means grouping + 2013-11-17 Peter Stephenson <p.w.stephenson@ntlworld.com> - * 32001: Src/subst.: fix crash on empty arrays with array + * 32001: Src/subst.c: fix crash on empty arrays with array intersection and disjunction. 2013-11-15 Barton E. Schaefer <schaefer@zsh.org> diff --git a/Src/glob.c b/Src/glob.c index e0d0cf68e..385b9e681 100644 --- a/Src/glob.c +++ b/Src/glob.c @@ -1171,7 +1171,7 @@ zglob(LinkList list, LinkNode np, int nountok) break; } } - if (*s != Inpar) + if (*s != Inpar || s == str) break; if (isset(EXTENDEDGLOB) && !zpc_disables[ZPC_HASH] && s[1] == Pound) { if (s[2] == 'q') { |