cellog Fri Jun 5 04:46:49 2009 UTC Modified files: (Branch: PHP_5_3) /php-src NEWS /php-src/ext/phar phar_object.c /php-src/ext/phar/tests phar_oo_011.phpt Log: MFH: fixed isset() on sub-directories (isset("blah") if file "blah/foo.php" exists) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.615&r2=1.2027.2.547.2.965.2.616&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.615 php-src/NEWS:1.2027.2.547.2.965.2.616 --- php-src/NEWS:1.2027.2.547.2.965.2.615 Thu Jun 4 19:59:09 2009 +++ php-src/NEWS Fri Jun 5 04:46:49 2009 @@ -23,6 +23,8 @@ PDO_PGSQL). (Matteo) - Fixed bug #38802 (max_redirects and ignore_errors). (patch by datib...@php.net) +- Fixed isset() on sub-directories (isset("blah") if file "blah/foo.php" exists). + (Greg) - Fixed security vulnerability in phar's handling of long tar filenames. (Greg) - Fixed potential segfault with converting phars containing metadata to other formats. (Greg) http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.62&r2=1.266.2.63&diff_format=u Index: php-src/ext/phar/phar_object.c diff -u php-src/ext/phar/phar_object.c:1.266.2.62 php-src/ext/phar/phar_object.c:1.266.2.63 --- php-src/ext/phar/phar_object.c:1.266.2.62 Sun May 24 18:50:58 2009 +++ php-src/ext/phar/phar_object.c Fri Jun 5 04:46:49 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: phar_object.c,v 1.266.2.62 2009/05/24 18:50:58 cellog Exp $ */ +/* $Id: phar_object.c,v 1.266.2.63 2009/06/05 04:46:49 cellog Exp $ */ #include "phar_internal.h" #include "func_interceptors.h" @@ -3526,6 +3526,9 @@ } RETURN_TRUE; } else { + if (zend_hash_exists(&phar_obj->arc.archive->virtual_dirs, fname, (uint) fname_len)) { + RETURN_TRUE; + } RETURN_FALSE; } } http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_oo_011.phpt?r1=1.8&r2=1.8.2.1&diff_format=u Index: php-src/ext/phar/tests/phar_oo_011.phpt diff -u php-src/ext/phar/tests/phar_oo_011.phpt:1.8 php-src/ext/phar/tests/phar_oo_011.phpt:1.8.2.1 --- php-src/ext/phar/tests/phar_oo_011.phpt:1.8 Wed Feb 20 13:32:59 2008 +++ php-src/ext/phar/tests/phar_oo_011.phpt Fri Jun 5 04:46:49 2009 @@ -16,9 +16,10 @@ $phar = new Phar($fname); $phar->setInfoClass('SplFileObject'); -$phar['f.php'] = 'hi'; -var_dump(isset($phar['f.php'])); -echo $phar['f.php']; +$phar['hi/f.php'] = 'hi'; +var_dump(isset($phar['hi'])); +var_dump(isset($phar['hi/f.php'])); +echo $phar['hi/f.php']; echo "\n"; ?> @@ -30,5 +31,6 @@ ?> --EXPECT-- bool(true) +bool(true) hi ===DONE===
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php