From bd5806aa0a98d8de6e1b6e7e4b7694b89952f08d Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Thu, 24 Sep 2015 20:51:59 +0200 Subject: 36603: glob: fix dirfd leak during Y shortcut qualifier --- ChangeLog | 11 +++++++---- Src/glob.c | 4 +++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 80a7d19c4..41a56f966 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,15 @@ +2015-09-24 Mikael Magnusson + + * 36603: Src/glob.c: fix dirfd leak during Y shortcut qualifier + 2015-09-24 Daniel Shahaf - * 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 - * 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 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; + } } } } -- cgit 1.4.1