summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoriyoshi Koizumi <moriyoshi@php.net>2003-10-29 18:48:37 +0000
committerMoriyoshi Koizumi <moriyoshi@php.net>2003-10-29 18:48:37 +0000
commit13f16d5690692c263cbe985afab117744d40cbaa (patch)
tree9d024a97b62553e9a1686dfa144cadf29af8ac01
parent9547ac2ddef2af6c04c2b171461e59c6d96dcf3e (diff)
downloadphp-git-13f16d5690692c263cbe985afab117744d40cbaa.tar.gz
MFB(r-1.109.2.12): A possible fix for bug #26026
-rw-r--r--ext/standard/dir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 25f96064e9..58f3cd8ee1 100644
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -401,7 +401,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;
}