Changeset 35365 for trunk/src/wp-includes/random_compat/random_int.php

Timestamp:

10/23/2015 04:21:01 AM (10 years ago)

Author:

dd32

Message:

Update to Random_Compat 1.0.9.
This update includes fixes for Windows support & libSodium support, and removes the Throwable Polyfill due to PHP7 incompatibilities.

Fixes #28633

File:

• trunk/src/wp-includes/random_compat/random_int.php (modified) (2 diffs)

trunk/src/wp-includes/random_compat/random_int.php

@@ -41 +41 @@
     /**
      * Type and input logic checks
+     * 
+     * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
+     * (non-inclusive), it will sanely cast it to an int. If you it's equal to
+     * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats 
+     * lose precision, so the <= and => operators might accidentally let a float
+     * through.
      */
-    if (!is_numeric($min)) {
+    
+    try {
+        $min = RandomCompat_intval($min);
+    } catch (TypeError $ex) {
         throw new TypeError(
             'random_int(): $min must be an integer'
         );
     }
-    if (!is_numeric($max)) {
+    try {
+        $max = RandomCompat_intval($max);
+    } catch (TypeError $ex) {
         throw new TypeError(
             'random_int(): $max must be an integer'
         );
     }
-
-    $min = (int) $min;
-    $max = (int) $max;
-
+    
+    /**
+     * Now that we've verified our weak typing system has given us an integer,
+     * let's validate the logic then we can move forward with generating random
+     * integers along a given range.
+     */
     if ($min > $max) {
         throw new Error(
@@ -165 +178 @@
          * If $val overflows to a floating point number,
          * ... or is larger than $max,
-         * ... or smaller than $int,
+         * ... or smaller than $min,
          * then try again.
          */