Fix #76584: PharFileInfo::decompress not working

We actually have to decompress, when told to do so.

diff --git a/NEWS b/NEWS
index fe4c2d37310adc0d5a59c09a5bad586e2eee3714..fc8aac06018e331ebe11f7590966dbaa45091879 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,9 @@ PHP                                                                        NEWS
 - OpenSSL:
   . Fixed bug #79145 (openssl memory leak). (cmb, Nikita)
 
+- Phar:
+  . Fixed bug #76584 (PharFileInfo::decompress not working). (cmb)
+
 - Reflection:
   . Fixed bug #79115 (ReflectionClass::isCloneable call reflected class
     __destruct). (Nikita)

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index ed5c546adc5f44cc857bf1fdadadea3d4304d479..e44bb56231450647a21ffa672966bbc4303f7d7a 100644 (file)
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -5011,6 +5011,7 @@ PHP_METHOD(PharFileInfo, compress)
 PHP_METHOD(PharFileInfo, decompress)
 {
        char *error;
+       char *compression_type;
        PHAR_ENTRY_OBJECT();
 
        if (zend_parse_parameters_none() == FAILURE) {
@@ -5061,12 +5062,24 @@ PHP_METHOD(PharFileInfo, decompress)
                /* re-populate after copy-on-write */
                entry_obj->entry = zend_hash_str_find_ptr(&phar->manifest, entry_obj->entry->filename, entry_obj->entry->filename_len);
        }
-       if (!entry_obj->entry->fp) {
-               if (FAILURE == phar_open_archive_fp(entry_obj->entry->phar)) {
-                       zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "Cannot decompress entry \"%s\", phar error: Cannot open phar archive \"%s\" for reading", entry_obj->entry->filename, entry_obj->entry->phar->fname);
+       switch (entry_obj->entry->flags & PHAR_ENT_COMPRESSION_MASK) {
+               case PHAR_ENT_COMPRESSED_GZ:
+                       compression_type = "gzip";
+                       break;
+               case PHAR_ENT_COMPRESSED_BZ2:
+                       compression_type = "bz2";
+                       break;
+               default:
+                       zend_throw_exception_ex(spl_ce_BadMethodCallException, 0,
+                               "Cannot decompress file compressed with unknown compression type");
                        return;
-               }
-               entry_obj->entry->fp_type = PHAR_FP;
+       }
+       /* decompress this file indirectly */
+       if (SUCCESS != phar_open_entry_fp(entry_obj->entry, &error, 1)) {
+               zend_throw_exception_ex(spl_ce_BadMethodCallException, 0,
+                       "Phar error: Cannot decompress %s-compressed file \"%s\" in phar \"%s\": %s", compression_type, entry_obj->entry->filename, entry_obj->entry->phar->fname, error);
+               efree(error);
+               return;
        }
 
        entry_obj->entry->old_flags = entry_obj->entry->flags;

diff --git a/ext/phar/tests/bug76584.phpt b/ext/phar/tests/bug76584.phpt
new file mode 100644 (file)
index 0000000..b37de08
--- /dev/null
+++ b/ext/phar/tests/bug76584.phpt
@@ -0,0 +1,35 @@
+--TEST--
+Bug #76584 (PharFileInfo::decompress not working)
+--SKIPIF--
+<?php
+if (!extension_loaded('phar')) die('skip phar extension not available');
+if (!extension_loaded('zlib')) die('skip zlib extension not available');
+?>
+--INI--
+phar.readonly=0
+--FILE--
+<?php
+$phar = new Phar(__DIR__ . '/76584.phar');
+$phar->addFromString('76584.txt', 'This is a test file.');
+$file = $phar['76584.txt'];
+var_dump($file->compress(Phar::GZ));
+var_dump($file->isCompressed());
+var_dump($file->decompress());
+var_dump($file->isCompressed());
+mkdir(__DIR__ . '/76584');
+var_dump($phar->extractTo(__DIR__ . '/76584'));
+echo file_get_contents(__DIR__ . '/76584/76584.txt');
+?>
+--EXPECT--
+bool(true)
+bool(true)
+bool(true)
+bool(false)
+bool(true)
+This is a test file.
+--CLEAN--
+<?php
+unlink(__DIR__ . '/76584/76584.txt');
+rmdir(__DIR__ . '/76584');
+unlink(__DIR__ . '/76584.phar');
+?>