Skip to content

[stable27] Ensure that the hash method does not return null #48102

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
blizzz merged 2 commits into from
Dec 5, 2024
Merged

[stable27] Ensure that the hash method does not return null #48102

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2608766
fix(files): Ensure that the hash method does not return null
artonge Jul 1, 2024
03a777b
chore: improve hash_file php usage in Local Storage
skjnldsv Sep 16, 2024
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
Prev Previous commit
chore: improve hash_file php usage in Local Storage 
Co-authored-by: Ferdinand Thiessen <[email protected]>
Signed-off-by: John Molakvoæ <[email protected]>
  • Loading branch information
@skjnldsv @susnux
skjnldsv and susnux committed Nov 18, 2024
commit 03a777b968b16e7ee25e72ddcc46a8a621de2111
9 changes: 1 addition & 8 deletions lib/private/Files/Storage/Local.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,14 +440,7 @@ public function fopen($path, $mode) {
}

public function hash($type, $path, $raw = false): string|false {
/** @var string|false|null */
$hash = hash_file($type, $this->getSourcePath($path), $raw);

if ($hash === null) {
return false;
}

return $hash;
return hash_file($type, $this->getSourcePath($path), $raw);
}

public function free_space($path) {
Expand Down
Loading