diff options
| author | Mikael Magnusson <mikachu@gmail.com> | 2015-09-24 20:51:59 +0200 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@gmail.com> | 2015-09-24 20:52:56 +0200 |
| commit | bd5806aa0a98d8de6e1b6e7e4b7694b89952f08d (patch) | |
| tree | 069a5323c6c049d70352c609cd33325f6f599553 | |
| parent | 4c935b9f85d25999a2ff9844274827f7905380f3 (diff) | |
| download | zsh-bd5806aa0a98d8de6e1b6e7e4b7694b89952f08d.tar.gz zsh-bd5806aa0a98d8de6e1b6e7e4b7694b89952f08d.zip | |
36603: glob: fix dirfd leak during Y shortcut qualifier
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Src/glob.c | 4 |
2 files changed, 10 insertions, 5 deletions
@@ -1,12 +1,15 @@ +2015-09-24 Mikael Magnusson <mikachu@gmail.com> + + * 36603: Src/glob.c: fix dirfd leak during Y shortcut qualifier + 2015-09-24 Daniel Shahaf <d.s@daniel.shahaf.name> - * unposted: Completion/Unix/Command/_hg: _hg: Declare $expl as - an array + * unposted: Completion/Unix/Command/_hg: Declare $expl as an array 2015-09-24 Christoph Mathys <eraserix@gmail.com> - * 36613: Completion/Unix/Command/_hg: _hg: extend completion - for hg push to support branch and bookmark + * 36613: Completion/Unix/Command/_hg: extend completion for hg + push to support branch and bookmark 2015-09-23 Barton E. Schaefer <schaefer@zsh.org> diff --git a/Src/glob.c b/Src/glob.c index 43d135b99..fa3ce25f4 100644 --- a/Src/glob.c +++ b/Src/glob.c @@ -634,8 +634,10 @@ scanner(Complist q, int shortcircuit) } else { /* if the last filename component, just add it */ insert(fn, 1); - if (shortcircuit && shortcircuit == matchct) + if (shortcircuit && shortcircuit == matchct) { + closedir(lock); return; + } } } } |