Fix null pointer access in GzipInputStream

amphp · May 8, 2017 · 59b2454 · 59b2454
1 parent 56ec64c
commit 59b2454
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/examples/benchmark-throughput.php b/examples/benchmark-throughput.php
@@ -53,4 +53,4 @@
 
     $stderr->write('read ' . $bytes . ' byte(s) in ' . round($t, 3) . ' second(s) => ' . round($bytes / 1024 / 1024 / $t, 1) . ' MiB/s' . PHP_EOL);
     $stderr->write('peak memory usage of ' . round(memory_get_peak_usage(true) / 1024 / 1024, 1) . ' MiB' . PHP_EOL);
-});
+});
diff --git a/lib/GzipInputStream.php b/lib/GzipInputStream.php
@@ -26,6 +26,11 @@ public function read(): Promise {
 
             $data = yield $this->source->read();
 
+            // Needs a double guard, as stream might have been closed while reading
+            if ($this->resource === null) {
+                return null;
+            }
+
             if ($data === null) {
                 $decompressed = \inflate_add($this->resource, "", \ZLIB_FINISH);