[PHP-CVS] cvs: php-src(PHP_5_2) /ext/posix posix.c /ext/posix/tests .cvsignore 001.phpt

[Nuno Lopes]

nlopess         Sat Sep 16 17:41:57 2006 UTC

  Added files:                 (Branch: PHP_5_2)
    /php-src/ext/posix/tests    .cvsignore 001.phpt 

  Modified files:              
    /php-src/ext/posix  posix.c 
  Log:
  fix possible crash in posix_access()
  
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.70.2.3.2.4&r2=1.70.2.3.2.5&diff_format=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.70.2.3.2.4 
php-src/ext/posix/posix.c:1.70.2.3.2.5
--- php-src/ext/posix/posix.c:1.70.2.3.2.4      Thu Aug 31 16:15:24 2006
+++ php-src/ext/posix/posix.c   Sat Sep 16 17:41:57 2006
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: posix.c,v 1.70.2.3.2.4 2006/08/31 16:15:24 tony2001 Exp $ */
+/* $Id: posix.c,v 1.70.2.3.2.5 2006/09/16 17:41:57 nlopess Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -147,7 +147,7 @@
 static PHP_MINFO_FUNCTION(posix)
 {
        php_info_print_table_start();
-       php_info_print_table_row(2, "Revision", "$Revision: 1.70.2.3.2.4 $");
+       php_info_print_table_row(2, "Revision", "$Revision: 1.70.2.3.2.5 $");
        php_info_print_table_end();
 }
 /* }}} */
@@ -771,6 +771,10 @@
        }
 
        path = expand_filepath(filename, NULL TSRMLS_CC);
+       if (!path) {
+               POSIX_G(last_error) = EIO;
+               RETURN_FALSE;
+       }
 
        if (php_check_open_basedir_ex(path, 0 TSRMLS_CC) ||
                        (PG(safe_mode) && (!php_checkuid_ex(filename, NULL, 
CHECKUID_CHECK_FILE_AND_DIR, CHECKUID_NO_ERRORS)))) {

http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/.cvsignore?view=markup&rev=1.1
Index: php-src/ext/posix/tests/.cvsignore
+++ php-src/ext/posix/tests/.cvsignore

http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/001.phpt?view=markup&rev=1.1
Index: php-src/ext/posix/tests/001.phpt
+++ php-src/ext/posix/tests/001.phpt

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