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

random: Narrow the parameter types of seed128/seed256

Browse source 
These internal-only functions accepted a `php_random_status`, just to extract
the internal state from the `state` pointer. Make them take the state struct
directly to improve type safety.
This commit is contained in:
Tim Düsterhus 2024-01-09 19:42:10 +01:00 • committed by Tim Düsterhus
parent 453f5ab053
commit 79f648ace2
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ext/random/engine_pcgoneseq128xslrr64.c
View file

@ -34,9 +34,8 @@ static inline void step(php_random_status_state_pcgoneseq128xslrr64 *s)
);
}
static inline void seed128(php_random_status *status, php_random_uint128_t seed)
static inline void seed128(php_random_status_state_pcgoneseq128xslrr64 *s, php_random_uint128_t seed)
{
php_random_status_state_pcgoneseq128xslrr64 *s = status->state;
s->state = php_random_uint128_constant(0ULL, 0ULL);
step(s);
s->state = php_random_uint128_add(s->state, seed);
@ -45,7 +44,7 @@ static inline void seed128(php_random_status *status, php_random_uint128_t seed)
static void seed(php_random_status *status, uint64_t seed)
{
seed128(status, php_random_uint128_constant(0ULL, seed));
seed128(status->state, php_random_uint128_constant(0ULL, seed));
}
static php_random_result generate(php_random_status *status)
@ -172,7 +171,7 @@ PHP_METHOD(Random_Engine_PcgOneseq128XslRr64, __construct)
}
}
seed128(engine->status, php_random_uint128_constant(t[0], t[1]));
seed128(state, php_random_uint128_constant(t[0], t[1]));
} else {
zend_argument_value_error(1, "must be a 16 byte (128 bit) string");
RETURN_THROWS();

8
ext/random/engine_xoshiro256starstar.c
View file

@ -81,10 +81,8 @@ static inline void jump(php_random_status_state_xoshiro256starstar *state, const
state->state[3] = s3;
}
static inline void seed256(php_random_status *status, uint64_t s0, uint64_t s1, uint64_t s2, uint64_t s3)
static inline void seed256(php_random_status_state_xoshiro256starstar *s, uint64_t s0, uint64_t s1, uint64_t s2, uint64_t s3)
{
php_random_status_state_xoshiro256starstar *s = status->state;
s->state[0] = s0;
s->state[1] = s1;
s->state[2] = s2;
@ -100,7 +98,7 @@ static void seed(php_random_status *status, uint64_t seed)
s[2] = splitmix64(&seed);
s[3] = splitmix64(&seed);
seed256(status, s[0], s[1], s[2], s[3]);
seed256(status->state, s[0], s[1], s[2], s[3]);
}
static php_random_result generate(php_random_status *status)
@ -237,7 +235,7 @@ PHP_METHOD(Random_Engine_Xoshiro256StarStar, __construct)
RETURN_THROWS();
}
seed256(engine->status, t[0], t[1], t[2], t[3]);
seed256(state, t[0], t[1], t[2], t[3]);
} else {
zend_argument_value_error(1, "must be a 32 byte (256 bit) string");
RETURN_THROWS();