1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-11 13:01:28 +02:00

36603: glob: fix dirfd leak during Y shortcut qualifier

This commit is contained in:
Mikael Magnusson 2015-09-24 20:51:59 +02:00
parent 4c935b9f85
commit bd5806aa0a
2 changed files with 10 additions and 5 deletions

View file

@ -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> 2015-09-24 Daniel Shahaf <d.s@daniel.shahaf.name>
* unposted: Completion/Unix/Command/_hg: _hg: Declare $expl as * unposted: Completion/Unix/Command/_hg: Declare $expl as an array
an array
2015-09-24 Christoph Mathys <eraserix@gmail.com> 2015-09-24 Christoph Mathys <eraserix@gmail.com>
* 36613: Completion/Unix/Command/_hg: _hg: extend completion * 36613: Completion/Unix/Command/_hg: extend completion for hg
for hg push to support branch and bookmark push to support branch and bookmark
2015-09-23 Barton E. Schaefer <schaefer@zsh.org> 2015-09-23 Barton E. Schaefer <schaefer@zsh.org>

View file

@ -634,11 +634,13 @@ scanner(Complist q, int shortcircuit)
} else { } else {
/* if the last filename component, just add it */ /* if the last filename component, just add it */
insert(fn, 1); insert(fn, 1);
if (shortcircuit && shortcircuit == matchct) if (shortcircuit && shortcircuit == matchct) {
closedir(lock);
return; return;
} }
} }
} }
}
closedir(lock); closedir(lock);
if (subdirs) { if (subdirs) {
int oppos = pathpos; int oppos = pathpos;