archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix PECL bug #13981: Third-party zips fail entry interrogation

Browse source
This commit is contained in:
Greg Beaver 2008-05-29 17:34:50 +00:00
parent e49404929a
commit 4cc79b39b4
2 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ext/phar/phar.c
View file

@ -1980,15 +1980,16 @@ int phar_postprocess_file(php_stream_wrapper *wrapper, int options, phar_entry_d
spprintf(error, 0, "phar error: internal corruption of zip-based phar \"%s\" (cannot read local file header for file \"%s\")", idata->phar->fname, entry->filename); spprintf(error, 0, "phar error: internal corruption of zip-based phar \"%s\" (cannot read local file header for file \"%s\")", idata->phar->fname, entry->filename);
return FAILURE; return FAILURE;
} }
/* fix up for big-endian systems */ /* verify local header */
/* verify local header if not yet verified */
if (entry->filename_len != PHAR_ZIP_16(local.filename_len) || entry->crc32 != PHAR_ZIP_32(local.crc32) || entry->uncompressed_filesize != PHAR_ZIP_32(local.uncompsize) || entry->compressed_filesize != PHAR_ZIP_32(local.compsize)) { if (entry->filename_len != PHAR_ZIP_16(local.filename_len) || entry->crc32 != PHAR_ZIP_32(local.crc32) || entry->uncompressed_filesize != PHAR_ZIP_32(local.uncompsize) || entry->compressed_filesize != PHAR_ZIP_32(local.compsize)) {
spprintf(error, 0, "phar error: internal corruption of zip-based phar \"%s\" (local head of file \"%s\" does not match central directory)", idata->phar->fname, entry->filename); spprintf(error, 0, "phar error: internal corruption of zip-based phar \"%s\" (local head of file \"%s\" does not match central directory)", idata->phar->fname, entry->filename);
return FAILURE; return FAILURE;
} }
if (-1 == php_stream_seek(idata->phar->fp, PHAR_ZIP_16(local.filename_len) + PHAR_ZIP_16(local.extra_len), SEEK_CUR)) { /* construct actual offset to file start - local extra_len can be different from central extra_len */
spprintf(error, 0, "phar error: internal corruption of zip-based phar \"%s\" (cannot seek to start of file data for file \"%s\")", idata->phar->fname, entry->filename); entry->offset = entry->offset_abs =
return FAILURE; sizeof(local) + entry->header_offset + PHAR_ZIP_16(local.filename_len) + PHAR_ZIP_16(local.extra_len);
if (idata->zero != entry->offset_abs) {
idata->zero = entry->offset_abs;
} }
} }
php_stream_seek(fp, idata->zero, SEEK_SET); php_stream_seek(fp, idata->zero, SEEK_SET);

13
ext/phar/tests/zip/unixzip.phpt
View file

@ -10,7 +10,8 @@ foreach ($a as $b) {
if ($b->isDir()) { if ($b->isDir()) {
echo "dir " . $b->getPathName() . "\n"; echo "dir " . $b->getPathName() . "\n";
} else { } else {
echo $b->getPathName() . "\n"; echo $b->getPathName(), "\n";
echo file_get_contents($b->getPathName()), "\n";
} }
} }
if (isset($a['notempty/hi.txt'])) { if (isset($a['notempty/hi.txt'])) {
@ -19,8 +20,10 @@ if (isset($a['notempty/hi.txt'])) {
?> ?>
===DONE=== ===DONE===
--EXPECTF-- --EXPECTF--
dir phar://%szip.zip%cempty dir phar:///home/cellog/workspace/php5/ext/phar/tests/zip/files/zip.zip/empty
phar://%szip.zip%chi.txt phar:///home/cellog/workspace/php5/ext/phar/tests/zip/files/zip.zip/hi.txt
dir phar://%szip.zip%cnotempty hi there
phar://%szip.zip/notempty/hi.txt
dir phar:///home/cellog/workspace/php5/ext/phar/tests/zip/files/zip.zip/notempty
phar:///home/cellog/workspace/php5/ext/phar/tests/zip/files/zip.zip/notempty/hi.txt
===DONE=== ===DONE===