Check resource before closing in encryption wrapper

In case of error there is no guarantee that $source or $target is set or
is a resource when handling an error.

Without this fix, there's a risk that fclose will fail and the actual
exception will not be thrown, making it impossible to find out about the
root cause.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>

diff --git a/lib/private/Files/Storage/Wrapper/Encryption.php b/lib/private/Files/Storage/Wrapper/Encryption.php
index 308952c2a31b62b6310b58404d7b75e8bf79dfce..3ee715ae3d32a71f48cfe832bb43a453ce49f65d 100644 (file)
--- a/lib/private/Files/Storage/Wrapper/Encryption.php
+++ b/lib/private/Files/Storage/Wrapper/Encryption.php
@@ -784,8 +784,12 @@ class Encryption extends Wrapper {
                                fclose($source);
                                fclose($target);
                        } catch (\Exception $e) {
-                               fclose($source);
-                               fclose($target);
+                               if (is_resource($source)) {
+                                       fclose($source);
+                               }
+                               if (is_resource($target)) {
+                                       fclose($target);
+                               }
                                throw $e;
                        }
                        if ($result) {