From 9e20746611393c40c46a0152070b428f186ecc7d Mon Sep 17 00:00:00 2001 From: Hannes Magnusson Date: Mon, 29 Aug 2011 14:19:54 +0000 Subject: [PATCH] Fixed bug#52013 (Unable to decompress files in a compressed phar) --- NEWS | 3 +++ ext/phar/phar.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 95ecd88b04..d34da25b4b 100644 --- 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 index 70035c7a45..24d8c428af 100644 --- 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 (entry->compressed_filesize != wrote) { + if (phar_stream_copy_to_stream(file, newfile, entry->compressed_filesize, &wrote) == FAILURE) { if (closeoldfile) { php_stream_close(oldfile); } -- 2.40.0