Skip to content

Add check for empty result in storage memcache #28549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 1 commit into from
Aug 9, 2017
Merged

Add check for empty result in storage memcache #28549

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/private/Files/Cache/Storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public static function getStorageById($storageId) {
self::$localCache = new CappedMemoryCache();
}
$result = self::$localCache->get($storageId);
if ($result === null) {
if ($result === null || empty($result) || !isset($result['numeric_id'])) {

@jvillafanez jvillafanez Aug 8, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any case where the empty($result) check is relevant? The isset check should be more restrictive anyway.

@PVince81 PVince81 Aug 9, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

empty($result) is in case an empty array is returned

@jvillafanez jvillafanez Aug 9, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

php > $a = [];
php > $b = isset($a['key']);
php > var_dump($b);
bool(false)

It should be covered with the isset check.

@PVince81 PVince81 Aug 9, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, I'll make a master only PR for perfection

@PVince81 PVince81 Aug 9, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh PHP... if this was JS that isset would fail

@PVince81 PVince81 Aug 9, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#28623

$result = self::getStorageByIdFromCache($storageId);
self::$localCache->set($storageId, $result);
}
Expand All @@ -134,7 +134,7 @@ private static function getDistributedCache() {
*/
private static function getStorageByIdFromCache($storageId) {
$result = self::getDistributedCache()->get($storageId);
if ($result === null) {
if ($result === null || empty($result) || !isset($result['numeric_id'])) {
$result = self::getStorageByIdFromDb($storageId);
self::getDistributedCache()->set(
$storageId, $result, self::$distributedCacheTTL
Expand Down