Skip to content

Fix incorrect if conditions in View #31754

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
come-nc merged 3 commits into from
Apr 5, 2022
Merged

Fix incorrect if conditions in View #31754

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
916fbe8
Fix incorrect if conditions in View
come-nc Mar 30, 2022
d36a1a7
Exit early if $storage is falsy in View::getDirectoryContent
come-nc Apr 5, 2022
140624d
composer run cs:fix
come-nc Apr 5, 2022
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
Next Next commit
Fix incorrect if conditions in View 
($something->getPermissions() && Constants::PERMISSION_READ) does not
  make sense as PERMISSION_READ contant is 1 this will always evaluate to
  true.
getPersmissions is returning an int which is a bitwise combination as
  documented in the interface, so it should be used with bit operators.

Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Apr 5, 2022
commit 916fbe81c6baabb59e7d5444cbc04bf696f679df
6 changes: 3 additions & 3 deletions lib/private/Files/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,7 @@ private function basicOperation($operation, $path, $hooks = [], $extraParam = nu
throw $e;
}

if ($result && in_array('delete', $hooks) and $result) {
if ($result && in_array('delete', $hooks)) {
$this->removeUpdate($storage, $internalPath);
}
if ($result && in_array('write', $hooks, true) && $operation !== 'fopen' && $operation !== 'touch') {
Expand Down Expand Up @@ -1450,7 +1450,7 @@ public function getDirectoryContent($directory, $mimetype_filter = '') {

$data = $this->getCacheEntry($storage, $internalPath, $directory);

if (!$data instanceof ICacheEntry || !isset($data['fileid']) || !($data->getPermissions() && Constants::PERMISSION_READ)) {
if (!$data instanceof ICacheEntry || !isset($data['fileid']) || !($data->getPermissions() & Constants::PERMISSION_READ)) {
return [];
}

Expand Down Expand Up @@ -1504,7 +1504,7 @@ public function getDirectoryContent($directory, $mimetype_filter = '') {
$rootEntry = $subCache->get('');
}

if ($rootEntry && ($rootEntry->getPermissions() && Constants::PERMISSION_READ)) {
if ($rootEntry && ($rootEntry->getPermissions() & Constants::PERMISSION_READ)) {
$relativePath = trim(substr($mountPoint, $dirLength), '/');
if ($pos = strpos($relativePath, '/')) {
//mountpoint inside subfolder add size to the correct folder
Expand Down