archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

test PharFileInfo::__construct, fix potential segfault, and bad logic in phar detection

Browse source
This commit is contained in:
Greg Beaver 2008-04-24 05:18:50 +00:00
parent 1f98c6526b
commit 91e67a4fbd
2 changed files with 60 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ext/phar/phar_object.c
View file

@ -3348,11 +3348,9 @@ PHP_METHOD(PharFileInfo, __construct)
return; return;
} }
if (phar_split_fname(fname, fname_len, &arch, &arch_len, &entry, &entry_len, 2, 0 TSRMLS_CC) == FAILURE) { if (fname_len < 7 || memcmp(fname, "phar://", 7) || phar_split_fname(fname, fname_len, &arch, &arch_len, &entry, &entry_len, 2, 0 TSRMLS_CC) == FAILURE) {
efree(arch); zend_throw_exception_ex(spl_ce_RuntimeException, 0 TSRMLS_CC,
efree(entry); "'%s' is not a valid phar archive URL (must have at least phar://filename.phar)", fname);
zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC,
"Cannot access phar file entry '%s'", fname);
return; return;
} }
@ -3360,18 +3358,18 @@ PHP_METHOD(PharFileInfo, __construct)
efree(arch); efree(arch);
efree(entry); efree(entry);
if (error) { if (error) {
zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, zend_throw_exception_ex(spl_ce_RuntimeException, 0 TSRMLS_CC,
"Cannot open phar file '%s': %s", fname, error); "Cannot open phar file '%s': %s", fname, error);
efree(error); efree(error);
} else { } else {
zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, zend_throw_exception_ex(spl_ce_RuntimeException, 0 TSRMLS_CC,
"Cannot open phar file '%s'", fname); "Cannot open phar file '%s'", fname);
} }
return; return;
} }
if ((entry_info = phar_get_entry_info_dir(phar_data, entry, entry_len, 1, &error TSRMLS_CC)) == NULL) { if ((entry_info = phar_get_entry_info_dir(phar_data, entry, entry_len, 1, &error TSRMLS_CC)) == NULL) {
zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, zend_throw_exception_ex(spl_ce_RuntimeException, 0 TSRMLS_CC,
"Cannot access phar file entry '%s' in archive '%s'%s%s", entry, arch, error?", ":"", error?error:""); "Cannot access phar file entry '%s' in archive '%s'%s%s", entry, arch, error?", ":"", error?error:"");
efree(arch); efree(arch);
efree(entry); efree(entry);

54
ext/phar/tests/pharfileinfo_construct.phpt Normal file
View file

@ -0,0 +1,54 @@
--TEST--
Phar: PharFileInfo::__construct
--SKIPIF--
<?php if (!extension_loaded("phar")) die("skip"); ?>
--INI--
phar.readonly=0
--FILE--
<?php
$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar';
$pname = 'phar://' . $fname;
try {
file_put_contents($fname, 'blah');
$a = new PharFileInfo($pname . '/oops');
} catch (Exception $e) {
echo $e->getMessage() . "\n";
unlink($fname);
}
$a = new PharFileInfo(array());
$a = new Phar($fname);
$a['a'] = 'hi';
$b = $a['a'];
try {
$a = new PharFileInfo($pname . '/oops/I/do/not/exist');
} catch (Exception $e) {
echo $e->getMessage() . "\n";
}
try {
$b->__construct('oops');
} catch (Exception $e) {
echo $e->getMessage() . "\n";
}
try {
$a = new PharFileInfo(__FILE__);
} catch (Exception $e) {
echo $e->getMessage() . "\n";
}
?>
===DONE===
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
--EXPECTF--
Cannot open phar file 'phar://%spharfileinfo_construct.phar/oops': internal corruption of phar "%spharfileinfo_construct.phar" (truncated entry)
Warning: PharFileInfo::__construct() expects parameter 1 to be string, array given in %spharfileinfo_construct.php on line %d
Cannot access phar file entry '/oops/I/do/not/exist' in archive '%spharfileinfo_construct.phar'
Cannot call constructor twice
'%spharfileinfo_construct.php' is not a valid phar archive URL (must have at least phar://filename.phar)
===DONE===