diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rwxr-xr-x | ext/phar/phar_object.c | 3 | ||||
| -rw-r--r-- | ext/phar/tests/phar_oo_011.phpt | 8 |
3 files changed, 10 insertions, 3 deletions
@@ -23,6 +23,8 @@ PHP NEWS PDO_PGSQL). (Matteo) - Fixed bug #38802 (max_redirects and ignore_errors). (patch by datibbaw@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) diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 6b03e62a45..a529c50eab 100755 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -3526,6 +3526,9 @@ PHP_METHOD(Phar, offsetExists) } RETURN_TRUE; } else { + if (zend_hash_exists(&phar_obj->arc.archive->virtual_dirs, fname, (uint) fname_len)) { + RETURN_TRUE; + } RETURN_FALSE; } } diff --git a/ext/phar/tests/phar_oo_011.phpt b/ext/phar/tests/phar_oo_011.phpt index 236009b7e4..cfbab702ad 100644 --- a/ext/phar/tests/phar_oo_011.phpt +++ b/ext/phar/tests/phar_oo_011.phpt @@ -16,9 +16,10 @@ require_once 'files/phar_oo_test.inc'; $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 @@ __halt_compiler(); ?> --EXPECT-- bool(true) +bool(true) hi ===DONE=== |