summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Magnusson <bjori@php.net>2011-08-29 14:19:54 +0000
committerHannes Magnusson <bjori@php.net>2011-08-29 14:19:54 +0000
commit8a83fee12ad55e9285b84d011550ff91aa90aecb (patch)
treedc12d68be95120c42700afd0ae74e45fdd64485a
parent5519b2ebe1802045196e92b73e6cecaca5004ddb (diff)
downloadphp-git-8a83fee12ad55e9285b84d011550ff91aa90aecb.tar.gz
Fixed bug#52013 (Unable to decompress files in a compressed phar)
-rw-r--r--ext/phar/phar.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 866eb41b18..c45efbf441 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -3101,9 +3101,7 @@ int phar_flush(phar_archive_data *phar, char *user_stub, long len, int convert,
/* this will have changed for all files that have either changed compression or been modified */
entry->offset = entry->offset_abs = offset;
offset += entry->compressed_filesize;
- phar_stream_copy_to_stream(file, newfile, entry->compressed_filesize, &wrote);
-
- if (entry->compressed_filesize != wrote) {
+ if (phar_stream_copy_to_stream(file, newfile, entry->compressed_filesize, &wrote) == FAILURE) {
if (closeoldfile) {
php_stream_close(oldfile);
}