Fixed bug#52013 (Unable to decompress files in a compressed phar)

php · Aug 29, 2011 · 9e20746 · 9e20746
1 parent abbf8be
commit 9e20746
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/NEWS b/NEWS
@@ -6,6 +6,9 @@ PHP                                                                        NEWS
   . Fixed bug #52461 (Incomplete doctype and missing xmlns). 
     (virsacer at web dot de, Pierre)
 
+- Phar:
+  . Fixed bug#52013 (Unable to decompress files in a compressed phar). (Hannes)
+
 - NSAPI SAPI:
   . Don't set $_SERVER['HTTPS'] on unsecure connection (bug #55403). (Uwe
     Schindler)

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
@@ -3103,9 +3103,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 (phar_stream_copy_to_stream(file, newfile, entry->compressed_filesize, &wrote) == FAILURE) {
-
-		if (entry->compressed_filesize != wrote) {
 			if (closeoldfile) {
 				php_stream_close(oldfile);
 			}