clean up if extraction fails

matomo-org · Nov 21, 2024 · a05a159 · a05a159
1 parent d46a1cc
commit a05a159
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 16 deletions.
diff --git a/src/Bzip.php b/src/Bzip.php
@@ -53,17 +53,22 @@ public function extract($pathExtracted)
         }
 
         $output = fopen($pathExtracted, 'w');
-        while (!feof($file)) {
-            $content = fread($file, 1024 * 1024);
 
-            if (false === $content) {
-                $this->error = "fread failed";
-                return false;
+        try {
+            while (!feof($file)) {
+                $content = fread($file, 1024 * 1024);
+
+                if (false === $content) {
+                    $this->error = "fread failed";
+                    @unlink($pathExtracted);
+                    return false;
+                }
+
+                fwrite($output, $content);
             }
-            
-            fwrite($output, $content);
+        } finally {
+            fclose($output);
         }
-        fclose($output);
 
         $success = bzclose($file);
         if (false === $success) {

diff --git a/src/Gzip.php b/src/Gzip.php
@@ -53,17 +53,22 @@ public function extract($pathExtracted)
         }
 
         $output = fopen($pathExtracted, 'w');
-        while (!feof($file)) {
-            $content = fread($file, 1024 * 1024);
 
-            if (false === $content) {
-                $this->error = "fread failed";
-                return false;
-            }
+        try {
+            while (!feof($file)) {
+                $content = fread($file, 1024 * 1024);
+
+                if (false === $content) {
+                    $this->error = "fread failed";
+                    @unlink($pathExtracted);
+                    return false;
+                }
 
-            fwrite($output, $content);
+                fwrite($output, $content);
+            }
+        } finally {
+            fclose($output);
         }
-        fclose($output);
 
         $success = gzclose($file);
         if (false === $success) {