Merge pull request #25 from matomo-org/dev-18670

Ensure that failing fread won't cause a hanging process
matomo-org · Nov 21, 2024 · 3e96938 · 3e96938
2 parents 28bc54b + e29d20c
commit 3e96938
Show file tree

Hide file tree

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

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