Skip to content

Handle files with is_file instead of file_exists #27440

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
skjnldsv merged 3 commits into from
Oct 23, 2021
Merged

Handle files with is_file instead of file_exists #27440

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9324a74
Handle files with is_file instead of file_exists
solracsf Jun 9, 2021
11169c8
Tests update
solracsf Aug 15, 2021
dae769d
Update Tests
solracsf Oct 22, 2021
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
Handle files with is_file instead of file_exists 
Should fix things like `fread(): read of 8192 bytes failed with errno=21 Is a directory`
  • Loading branch information
@solracsf
solracsf committed Aug 15, 2021
commit 9324a74bbaa37dd57ac3db33074aa3547d347313
8 changes: 4 additions & 4 deletions lib/private/Files/Storage/Wrapper/Encryption.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ public function fopen($path, $mode) {
if ($this->util->isExcluded($fullPath) === false) {
$size = $unencryptedSize = 0;
$realFile = $this->util->stripPartialFileExtension($path);
$targetExists = $this->file_exists($realFile) || $this->file_exists($path);
$targetExists = $this->is_file($realFile) || $this->file_exists($path);
$targetIsEncrypted = false;
if ($targetExists) {
// in case the file exists we require the explicit module as
Expand Down Expand Up @@ -855,7 +855,7 @@ protected function getFullPath($path) {
*/
protected function readFirstBlock($path) {
$firstBlock = '';
if ($this->storage->file_exists($path)) {
if ($this->storage->is_file($path)) {
$handle = $this->storage->fopen($path, 'r');
$firstBlock = fread($handle, $this->util->getHeaderSize());
fclose($handle);
Expand All @@ -872,7 +872,7 @@ protected function readFirstBlock($path) {
protected function getHeaderSize($path) {
$headerSize = 0;
$realFile = $this->util->stripPartialFileExtension($path);
if ($this->storage->file_exists($realFile)) {
if ($this->storage->is_file($realFile)) {
$path = $realFile;
}
$firstBlock = $this->readFirstBlock($path);
Expand Down Expand Up @@ -920,7 +920,7 @@ protected function parseRawHeader($rawHeader) {
*/
protected function getHeader($path) {
$realFile = $this->util->stripPartialFileExtension($path);
$exists = $this->storage->file_exists($realFile);
$exists = $this->storage->is_file($realFile);
if ($exists) {
$path = $realFile;
}
Expand Down