A possible fix for bug #26026.

# Actually a revisit of the patch on 1.112, mysteriously backed out on 1.119.

diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index bfec94618ed20a6944253e27a667e9d4eb746b6e..913da98b18b98503e0cd2e765a033f3af0070080 100644 (file)
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -398,7 +398,7 @@ PHP_FUNCTION(glob)
 
 #ifndef GLOB_NOMATCH
        /* now catch the FreeBSD style of "no matches" */
-       if (!globbuf.gl_pathc) {
+       if (!globbuf.gl_pathc || !globbuf.gl_pathv) {
                array_init(return_value);
                return;
        }