From 9f5f970957bd729f8773f07c86122873efdf9d9f Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 2 Sep 2022 12:27:13 +0200 Subject: [PATCH] handle errors from hash_final Signed-off-by: Robin Appelman --- lib/private/Files/Stream/HashWrapper.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/private/Files/Stream/HashWrapper.php b/lib/private/Files/Stream/HashWrapper.php index b2bfcff68d4..4060d74de7d 100644 --- a/lib/private/Files/Stream/HashWrapper.php +++ b/lib/private/Files/Stream/HashWrapper.php @@ -69,8 +69,13 @@ class HashWrapper extends Wrapper { if (is_callable($this->callback)) { // 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); + try { + $hash = @hash_final($this->hash); + if ($hash) { + call_user_func($this->callback, $hash); + } + } catch (\Throwable $e) { + } } // prevent further calls by potential PHP 7 GC ghosts $this->callback = null; -- 2.39.5