PATCH: Fix leak during Y shortcircuit glob qualifier

[Mikael Magnusson <mikachu@gmail.com>]

The closedir(lock) is the leak I actually did see in usage, I have no
idea if the other part is needed/harmful though. I'll commit just the
closedir if nobody has any opinions.

---
 Src/glob.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Src/glob.c b/Src/glob.c
index 4db6570..8fbefc9 100644
--- a/Src/glob.c
+++ b/Src/glob.c
@@ -534,7 +534,7 @@ scanner(Complist q, int shortcircuit)
 		    if (!closure || !statfullpath("", NULL, 1)) {
 			scanner((q->closure) ? q : q->next, shortcircuit);
 			if (shortcircuit && shortcircuit == matchct)
-			    return;
+			    goto freedir;
 		    }
 		    pathbuf[pathpos = oppos] = '\0';
 		}
@@ -544,7 +544,7 @@ scanner(Complist q, int shortcircuit)
 		str = dupstrpfx(str, l);
 	    insert(str, 0);
 	    if (shortcircuit && shortcircuit == matchct)
-		return;
+		goto freedir;
 	}
     } else {
 	/* Do pattern matching on current path section. */
@@ -635,8 +635,10 @@ scanner(Complist q, int shortcircuit)
 		} else {
 		    /* if the last filename component, just add it */
 		    insert(fn, 1);
-		    if (shortcircuit && shortcircuit == matchct)
-			return;
+		    if (shortcircuit && shortcircuit == matchct) {
+			closedir(lock);
+			goto freedir;
+		    }
 		}
 	    }
 	}
@@ -659,6 +661,7 @@ scanner(Complist q, int shortcircuit)
 	    hrealloc(subdirs, subdirlen, 0);
 	}
     }
+freedir:
     if (pbcwdsav < pathbufcwd) {
 	if (restoredir(&ds))
 	    zerr("current directory lost during glob");
-- 
2.5.0