From a9575a7029f21226ef2f8372be4f7e433e6a59fa Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 31 Aug 2022 15:05:10 +0200 Subject: [PATCH] handle cases where the hash context gets cleaned up before the hash wrapper Signed-off-by: Robin Appelman --- lib/private/Files/Stream/HashWrapper.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/private/Files/Stream/HashWrapper.php b/lib/private/Files/Stream/HashWrapper.php index fd9bb3cdd0b..b2bfcff68d4 100644 --- a/lib/private/Files/Stream/HashWrapper.php +++ b/lib/private/Files/Stream/HashWrapper.php @@ -67,7 +67,11 @@ class HashWrapper extends Wrapper { public function stream_close() { if (is_callable($this->callback)) { - call_user_func($this->callback, hash_final($this->hash)); + // if the stream is closed as a result of the end-of-request GC, the hash context might be cleaned up before this stream + if ($this->hash instanceof \HashContext) { + $hash = hash_final($this->hash); + call_user_func($this->callback, $hash); + } // prevent further calls by potential PHP 7 GC ghosts $this->callback = null; }