avoid memory leak in ZlibReader

aternosorg · Nov 13, 2023 · b3f34ca · b3f34ca
1 parent 6b2a928
commit b3f34ca
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 0 deletions.
diff --git a/src/Chunk/AnvilChunk.php b/src/Chunk/AnvilChunk.php
@@ -340,4 +340,12 @@ public function getGlobalYPos(): int
     {
         return $this->regionPosition[1] * 32 +  $this->yPos;
     }
+
+    /**
+     * @return void
+     */
+    public function close(): void
+    {
+        $this->zlibReader->reset();
+    }
 }
diff --git a/src/Chunk/ChunkInterface.php b/src/Chunk/ChunkInterface.php
@@ -71,4 +71,9 @@ public function save(): void;
      * @return bool
      */
     public function isSaved(): bool;
+
+    /**
+     * @return void
+     */
+    public function close(): void;
 }
diff --git a/src/Reader/ReaderInterface.php b/src/Reader/ReaderInterface.php
@@ -43,4 +43,9 @@ public function tell(): int;
      * @return bool
      */
     public function eof(): bool;
+
+    /**
+     * @return void
+     */
+    public function reset(): void;
 }
diff --git a/src/Reader/ZlibReader.php b/src/Reader/ZlibReader.php
@@ -141,6 +141,17 @@ public function rewind(): void
         $this->pointer = 0;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function reset(): void
+    {
+        $this->data = '';
+        $this->pointer = 0;
+        $this->resourcePointer = $this->offset;
+        $this->inflateContext = inflate_init($this->compression);
+    }
+
     public function eof(): bool
     {
         return ($this->resourcePointer >= $this->offset + $this->length || feof($this->resource))

diff --git a/src/Task/RegionTask.php b/src/Task/RegionTask.php
@@ -42,6 +42,7 @@ public function __construct(
             } else {
                 $removedChunks++;
             }
+            $chunk->close();
         }
         $region->save();
         return $removedChunks;