iliaa Sun Jul 2 13:51:41 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard filestat.c
/php-src NEWS
Log:
Fixed bug #37987 (invalid return of file_exists() in safe mode).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/filestat.c?r1=1.136.2.8.2.2&r2=1.136.2.8.2.3&diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.136.2.8.2.2
php-src/ext/standard/filestat.c:1.136.2.8.2.3
--- php-src/ext/standard/filestat.c:1.136.2.8.2.2 Fri Jun 30 10:53:11 2006
+++ php-src/ext/standard/filestat.c Sun Jul 2 13:51:40 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filestat.c,v 1.136.2.8.2.2 2006/06/30 10:53:11 tony2001 Exp $ */
+/* $Id: filestat.c,v 1.136.2.8.2.3 2006/07/02 13:51:40 iliaa Exp $ */
#include "php.h"
#include "safe_mode.h"
@@ -660,7 +660,7 @@
}
if ((wrapper = php_stream_locate_url_wrapper(filename, &local, 0
TSRMLS_CC)) == &php_plain_files_wrapper) {
- if (php_check_open_basedir(local TSRMLS_CC)) {
+ if (php_check_open_basedir(local TSRMLS_CC) || (PG(safe_mode)
&& !php_checkuid_ex(filename, NULL, CHECKUID_ALLOW_FILE_NOT_EXISTS,
CHECKUID_NO_ERRORS))) {
RETURN_FALSE;
}
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.101&r2=1.2027.2.547.2.102&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.101 php-src/NEWS:1.2027.2.547.2.102
--- php-src/NEWS:1.2027.2.547.2.101 Fri Jun 30 10:55:06 2006
+++ php-src/NEWS Sun Jul 2 13:51:40 2006
@@ -74,6 +74,7 @@
- Fixed memory leaks in openssl streams context options. (Pierre)
- Fixed handling of extremely long paths inside tempnam() function. (Ilia)
+- Fixed bug #37987 (invalid return of file_exists() in safe mode). (Ilia)
- Fixed bug #37931 (possible crash in OCI8 after database restart
when using persistent connections). (Tony)
- Fixed bug #37920 (compilation problems on z/OS). (Tony)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
