mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23714 from nextcloud/backport/23645/stable19 

[stable19] Check if array elements exist before using them
This commit is contained in:
Morris Jobke 2020-10-27 16:26:03 +01:00 committed by GitHub
parent 9007a8a004 2cafd81d23
commit 93bc5ea744
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/files_external/lib/Lib/Storage/AmazonS3.php
View File

@ -164,7 +164,13 @@ class AmazonS3 extends \OC\Files\Storage\Common {
'MaxKeys' => 1, 'MaxKeys' => 1,
'Delimiter' => '/', 'Delimiter' => '/',
]); ]);
$this->directoryCache[$path] = ($result['Contents'][0]['Key'] === rtrim($path, '/') . '/') || $result['CommonPrefixes'];
if ((isset($result['Contents'][0]['Key']) && $result['Contents'][0]['Key'] === rtrim($path, '/') . '/')
|| isset($result['CommonPrefixes'])) {
$this->directoryCache[$path] = true;
} else {
$this->directoryCache[$path] = false;
}
} catch (S3Exception $e) { } catch (S3Exception $e) {
if ($e->getStatusCode() === 403) { if ($e->getStatusCode() === 403) {
$this->directoryCache[$path] = false; $this->directoryCache[$path] = false;