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

[Moriyoshi Koizumi]

moriyoshi               Wed Oct 29 13:46:40 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/ext/standard       dir.c 
  Log:
  A possible fix for bug #26026.
  # Actually a revisit of the patch on 1.112, mysteriously backed out on 1.119.
  
  
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.109.2.11 php-src/ext/standard/dir.c:1.109.2.12
--- php-src/ext/standard/dir.c:1.109.2.11       Fri Sep 19 22:52:45 2003
+++ php-src/ext/standard/dir.c  Wed Oct 29 13:46:40 2003
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dir.c,v 1.109.2.11 2003/09/20 02:52:45 iliaa Exp $ */
+/* $Id: dir.c,v 1.109.2.12 2003/10/29 18:46:40 moriyoshi Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -398,7 +398,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