fix(core) Fix 2 problems in random_int fallback

Throw Exception when max is less than min Unpack with Q instead of C to support ranges wider than 255 issue #5843

fix(core) Fix 2 problems in random_int fallback
Throw Exception when max is less than min Unpack with Q instead of C to support ranges wider than 255 issue #5843
a8f4d2eb · Côme Chilliet · 7ed10135 · a8f4d2eb
Commit a8f4d2eb authored 6 years ago by Côme Chilliet
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 2 deletions
+2 -2
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -2468,7 +2468,7 @@ if (!function_exists('random_int')) {
  {
    $range = $max - $min;
    if ($range <= 0) {
-      return $min;
+      throw new Exception('Invalid range passed to random_int');
    }

    $log    = log($range, 2);
@@ -2483,7 +2483,7 @@ if (!function_exists('random_int')) {
      if (!$strong || ($randomBytes === FALSE)) {
        throw new Exception('Failed to get random bytes');
      }
-      $rnd = unpack('C', $randomBytes)[1];
+      $rnd = unpack('Q', $randomBytes)[1];
      // discard irrelevant bits
      $rnd = $rnd & $filter;
    } while ($rnd >= $range);