Issue #3156879 by alexpott, Krzysztof Domański: \Drupal\Component\Uti…

…lity\Bytes::toInt() - ensure $size is a number type (cherry picked from commit ff722653958673b16619c98ec0e5fd2fcd91e6af)
drupal · Aug 3, 2020 · 035faa2 · 035faa2
1 parent a30e371
commit 035faa2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/Drupal/Component/Utility/Bytes.php b/lib/Drupal/Component/Utility/Bytes.php
@@ -35,7 +35,8 @@ public static function toInt($size) {
       return round($size * pow(self::KILOBYTE, stripos('bkmgtpezy', $unit[0])));
     }
     else {
-      return round($size);
+      // Ensure size is a proper number type.
+      return round((float) $size);
     }
   }
 

diff --git a/tests/Drupal/Tests/Component/Utility/BytesTest.php b/tests/Drupal/Tests/Component/Utility/BytesTest.php
@@ -56,6 +56,9 @@ public function providerTestToInt() {
       ['76MRandomStringThatShouldBeIgnoredByParseSize.', 79691776],
       // 76.24 GB (with typo).
       ['76.24 Giggabyte', 81862076662],
+      ['1.5', 2],
+      ['2.4', 2],
+      ['', 0],
     ];
   }