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

ext/random: Fix signess issues

Browse source
This commit is contained in:
Gina Peter Banyard 2024-06-03 05:53:11 +01:00
parent efee76b8e2
commit 8c16076dc3
2 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ext/random/randomizer.c
View file

@ -277,18 +277,19 @@ PHP_METHOD(Random_Randomizer, getBytes)
php_random_algo_with_state engine = randomizer->engine;
zend_string *retval;
zend_long length;
zend_long user_length;
size_t total_size = 0;
ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_LONG(length)
Z_PARAM_LONG(user_length)
ZEND_PARSE_PARAMETERS_END();
if (length < 1) {
if (user_length < 1) {
zend_argument_value_error(1, "must be greater than 0");
RETURN_THROWS();
}
size_t length = (size_t)user_length;
retval = zend_string_alloc(length, 0);
while (total_size < length) {
@ -385,13 +386,13 @@ PHP_METHOD(Random_Randomizer, getBytesFromString)
php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
php_random_algo_with_state engine = randomizer->engine;
zend_long length;
zend_long user_length;
zend_string *source, *retval;
size_t total_size = 0;
ZEND_PARSE_PARAMETERS_START(2, 2);
Z_PARAM_STR(source)
Z_PARAM_LONG(length)
Z_PARAM_LONG(user_length)
ZEND_PARSE_PARAMETERS_END();
const size_t source_length = ZSTR_LEN(source);
@ -402,11 +403,12 @@ PHP_METHOD(Random_Randomizer, getBytesFromString)
RETURN_THROWS();
}
if (length < 1) {
if (user_length < 1) {
zend_argument_value_error(2, "must be greater than 0");
RETURN_THROWS();
}
size_t length = (size_t)user_length;
retval = zend_string_alloc(length, 0);
if (max_offset > 0xff) {