Fix nextcloud#23373 fclose on non-opened stream

Signed-off-by: tsdicloud <bernd.rederlechner@t-systems.com>
nextmcloud · Mar 15, 2021 · fe7f47b · fe7f47b
1 parent d585a4f
commit fe7f47b
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/lib/private/Files/ObjectStore/S3ObjectTrait.php b/lib/private/Files/ObjectStore/S3ObjectTrait.php
@@ -115,9 +115,14 @@ public function writeObject($urn, $stream) {
 			} else {
 				throw $e;
 			}
+		} finally {
+			// this handles [S3] fclose(): supplied resource is not a valid stream resource #23373
+			// see https://stackoverflow.com/questions/11247507/fclose-18-is-not-a-valid-stream-resource/11247555
+			// which also recommends the solution 
+			if (is_resource($countStream)) {
+				fclose($countStream);
+			}
 		}
-
-		fclose($countStream);
 	}
 
 	/**