MFH

diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 11357b8d941a9afaee8c218fedd333204b0d35da..b7947030ce2d98e66ac922717893e16b4a8cb89e 100644 (file)
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -398,11 +398,16 @@ PHP_FUNCTION(glob)
                RETURN_FALSE;
        }
 
+#ifndef GLOB_NOMATCH
+       // now catch the FreeBSD style of "no matches"
+       if (!globbuf.gl_pathc) {
+                       array_init(return_value);
+                       return;
+       }
+#endif
+
        /* we assume that any glob pattern will match files from one directory only
           so checking the dirname of the first match should be sufficient */
-       if (!globbuf.gl_pathv) {
-               RETURN_FALSE;
-       }
        strncpy(cwd, globbuf.gl_pathv[0], MAXPATHLEN);
        if (PG(safe_mode) && (!php_checkuid(cwd, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
                RETURN_FALSE;