[PHP-CVS] cvs: php-src /ext/standard dir.c

[Moriyoshi Koizumi]

moriyoshi               Wed Oct 29 13:48:38 2003 EDT

  Modified files:              
    /php-src/ext/standard       dir.c 
  Log:
  MFB(r-1.109.2.12): A possible fix for bug #26026
  
  
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.129 php-src/ext/standard/dir.c:1.130
--- php-src/ext/standard/dir.c:1.129    Fri Sep 26 04:09:55 2003
+++ php-src/ext/standard/dir.c  Wed Oct 29 13:48:37 2003
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dir.c,v 1.129 2003/09/26 08:09:55 hholzgra Exp $ */
+/* $Id: dir.c,v 1.130 2003/10/29 18:48:37 moriyoshi Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -401,7 +401,7 @@
 
 #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;
        }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php