diff options
| -rw-r--r-- | ext/standard/mt_rand.c | 4 | ||||
| -rw-r--r-- | ext/standard/tests/math/bug75514.phpt | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/ext/standard/mt_rand.c b/ext/standard/mt_rand.c index 0e2fe5143a..0a76ab8282 100644 --- a/ext/standard/mt_rand.c +++ b/ext/standard/mt_rand.c @@ -260,7 +260,7 @@ PHPAPI zend_long php_mt_rand_range(zend_long min, zend_long max) * rand() allows min > max, mt_rand does not */ PHPAPI zend_long php_mt_rand_common(zend_long min, zend_long max) { - zend_long n; + uint32_t n; if (BG(mt_rand_mode) == MT_RAND_MT19937) { return php_mt_rand_range(min, max); @@ -268,7 +268,7 @@ PHPAPI zend_long php_mt_rand_common(zend_long min, zend_long max) /* Legacy mode deliberately not inside php_mt_rand_range() * to prevent other functions being affected */ - n = (zend_long)php_mt_rand() >> 1; + n = php_mt_rand() >> 1; RAND_RANGE_BADSCALING(n, min, max, PHP_MT_RAND_MAX); return n; diff --git a/ext/standard/tests/math/bug75514.phpt b/ext/standard/tests/math/bug75514.phpt new file mode 100644 index 0000000000..af97b6d0e1 --- /dev/null +++ b/ext/standard/tests/math/bug75514.phpt @@ -0,0 +1,12 @@ +--TEST-- +Bug #75514 mt_rand returns value outside [$min,$max] +--FILE-- +<?php +mt_srand(0, MT_RAND_PHP); +var_dump(mt_rand(0,999999999), mt_rand(0,999)); +?> +===Done=== +--EXPECT-- +int(448865905) +int(592) +===Done=== |