Merge pull request #39367 from nextcloud/s3-fopen-exception

handle more exceptions in AmazonS3::fopen
nextcloud · Jul 20, 2023 · 31f1ff8 · 31f1ff8
2 parents 70a9d66 + b0e663f
commit 31f1ff8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php
@@ -497,7 +497,7 @@ public function fopen($path, $mode) {
 
 				try {
 					return $this->readObject($path);
-				} catch (S3Exception $e) {
+				} catch (\Exception $e) {
 					$this->logger->error($e->getMessage(), [
 						'app' => 'files_external',
 						'exception' => $e,

diff --git a/lib/private/Files/Stream/SeekableHttpStream.php b/lib/private/Files/Stream/SeekableHttpStream.php
@@ -219,7 +219,9 @@ public function stream_tell() {
 	public function stream_stat() {
 		if ($this->getCurrent()) {
 			$stat = fstat($this->getCurrent());
-			$stat['size'] = $this->totalSize;
+			if ($stat) {
+				$stat['size'] = $this->totalSize;
+			}
 			return $stat;
 		} else {
 			return false;