Skip to content

Remove superfluous helper variable in Randomizer::getBytes() #9563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 20, 2022
Merged

Remove superfluous helper variable in Randomizer::getBytes() #9563

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81d3704
Remove superfluous helper variable in Randomizer::getBytes()
joshuaruesweg Sep 16, 2022
ff9e6d3
Reduce the scope of `result` in Randomizer::getBytes()
TimWolla Sep 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions ext/random/randomizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,7 @@ PHP_METHOD(Random_Randomizer, getBytes)
php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
zend_string *retval;
zend_long length;
uint64_t result;
size_t total_size = 0, required_size;
size_t total_size = 0;

ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_LONG(length)
Expand All @@ -154,17 +153,16 @@ PHP_METHOD(Random_Randomizer, getBytes)
}

retval = zend_string_alloc(length, 0);
required_size = length;

while (total_size < required_size) {
result = randomizer->algo->generate(randomizer->status);
while (total_size < length) {
uint64_t result = randomizer->algo->generate(randomizer->status);
if (EG(exception)) {
zend_string_free(retval);
RETURN_THROWS();
}
for (size_t i = 0; i < randomizer->status->last_generated_size; i++) {
ZSTR_VAL(retval)[total_size++] = (result >> (i * 8)) & 0xff;
if (total_size >= required_size) {
if (total_size >= length) {
break;
}
}
Expand Down