mirror of
https://github.com/php/php-src.git
synced 2024-09-23 19:07:26 +00:00
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: entry for #64214 other fix for #64214, unmodified file may not have old fp set, causing other possible crashes
This commit is contained in:
commit
aff65a0346
@ -937,10 +937,11 @@ is_compressed:
|
|||||||
PHAR_SET_32(local.uncompsize, entry->uncompressed_filesize);
|
PHAR_SET_32(local.uncompsize, entry->uncompressed_filesize);
|
||||||
PHAR_SET_32(central.compsize, entry->compressed_filesize);
|
PHAR_SET_32(central.compsize, entry->compressed_filesize);
|
||||||
PHAR_SET_32(local.compsize, entry->compressed_filesize);
|
PHAR_SET_32(local.compsize, entry->compressed_filesize);
|
||||||
|
if (p->old) {
|
||||||
if (-1 == php_stream_seek(p->old, entry->offset_abs, SEEK_SET)) {
|
if (-1 == php_stream_seek(p->old, entry->offset_abs, SEEK_SET)) {
|
||||||
spprintf(p->error, 0, "unable to seek to start of file \"%s\" while creating zip-based phar \"%s\"", entry->filename, entry->phar->fname);
|
spprintf(p->error, 0, "unable to seek to start of file \"%s\" while creating zip-based phar \"%s\"", entry->filename, entry->phar->fname);
|
||||||
return ZEND_HASH_APPLY_STOP;
|
return ZEND_HASH_APPLY_STOP;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
not_compressed:
|
not_compressed:
|
||||||
|
Loading…
Reference in New Issue
Block a user