upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Fix computerFileSize when called with a string without unit

Browse source 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2023-01-23 12:13:32 +01:00
parent 0753be3ff2
commit d00422b812
No known key found for this signature in database
GPG key ID: A3E2F658B28C760A
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/Command/Log/File.php
View file

@ -115,14 +115,12 @@ class File extends Command implements Completion\CompletionAwareInterface {
}
/**
* @param mixed $rotateSize
* @throws \InvalidArgumentException
*/
protected function validateRotateSize(&$rotateSize) {
protected function validateRotateSize(false|int|float $rotateSize): void {
if ($rotateSize === false) {
throw new \InvalidArgumentException('Error parsing log rotation file size');
}
$rotateSize = (int) $rotateSize;
if ($rotateSize < 0) {
throw new \InvalidArgumentException('Log rotation file size must be non-negative');
}

3
lib/private/legacy/OC_Helper.php
View file

@ -104,6 +104,9 @@ class OC_Helper {
*/
public static function computerFileSize(string $str): false|int|float {
$str = strtolower($str);
if (is_numeric($str)) {
return Util::numericToNumber($str);
}
$bytes_array = [
'b' => 1,