about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--Src/glob.c4
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  <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;
+		    }
 		}
 	    }
 	}