clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use unsigned subtraction in php_random_int()

Browse Source 
This subtraction may overflow the signed domain, which is UB. Use
an unsigned subtraction instead.
This commit is contained in:
Nikita Popov 2019-09-03 11:05:47 +02:00
parent ac356ba81f
commit 265af40a0a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/standard/random.c
View File

@ -235,7 +235,7 @@ PHPAPI int php_random_int(zend_long min, zend_long max, zend_long *result, zend_
return SUCCESS;
}
umax = max - min;
umax = (zend_ulong) max - (zend_ulong) min;
if (php_random_bytes(&trial, sizeof(trial), should_throw) == FAILURE) {
return FAILURE;

7
ext/standard/tests/random/random_int.phpt
View File

@ -2,7 +2,6 @@
Test normal operation of random_int()
--FILE--
<?php
//-=-=-=-
var_dump(is_int(random_int(10, 100)));
@ -10,11 +9,15 @@ $x = random_int(10, 100);
var_dump($x >= 10 && $x <= 100);
var_dump(random_int(-1000, -1) < 0);
var_dump(random_int(-1, PHP_INT_MAX) >= -1);
var_dump(is_int(random_int(PHP_INT_MIN, PHP_INT_MAX)));
var_dump(random_int(42,42));
?>
--EXPECT--
--EXPECTF--
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)