archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.4'

Browse source
This commit is contained in:
David Carlier 2024-10-20 21:44:41 +01:00
commit c025ce4d66
No known key found for this signature in database
GPG key ID: 8486F847B4B94EF1
3 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ext/gmp/gmp.c
View file

@ -1821,15 +1821,21 @@ ZEND_FUNCTION(gmp_random_bits)
RETURN_THROWS(); RETURN_THROWS();
} }
if (bits <= 0) { #if SIZEOF_SIZE_T == 4
zend_argument_value_error(1, "must be greater than or equal to 1"); const zend_long maxbits = ULONG_MAX / GMP_NUMB_BITS;
#else
const zend_long maxbits = INT_MAX;
#endif
if (bits <= 0 || bits > maxbits) {
zend_argument_value_error(1, "must be between 1 and " ZEND_LONG_FMT, maxbits);
RETURN_THROWS(); RETURN_THROWS();
} }
INIT_GMP_RETVAL(gmpnum_result); INIT_GMP_RETVAL(gmpnum_result);
gmp_init_random(); gmp_init_random();
mpz_urandomb(gmpnum_result, GMPG(rand_state), bits); mpz_urandomb(gmpnum_result, GMPG(rand_state), (mp_bitcnt_t)bits);
} }
/* }}} */ /* }}} */

14
ext/gmp/tests/gh16501.phpt Normal file
View file

@ -0,0 +1,14 @@
--TEST--
GH-16501 (gmp_random_bits overflow)
--EXTENSIONS--
gmp
--FILE--
<?php
try {
gmp_random_bits(PHP_INT_MAX);
} catch (\ValueError $e) {
echo $e->getMessage();
}
?>
--EXPECTF--
gmp_random_bits(): Argument #1 ($bits) must be between 1 and %d

6
ext/gmp/tests/gmp_random_bits.phpt
View file

@ -40,7 +40,7 @@ while (1) {
echo "Done\n"; echo "Done\n";
?> ?>
--EXPECT-- --EXPECTF--
gmp_random_bits(): Argument #1 ($bits) must be greater than or equal to 1 gmp_random_bits(): Argument #1 ($bits) must be between 1 and %d
gmp_random_bits(): Argument #1 ($bits) must be greater than or equal to 1 gmp_random_bits(): Argument #1 ($bits) must be between 1 and %d
Done Done