Skip to content

Use specialized functions/macros to reduce code size in ext/random #18499

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 1 commit into from
May 5, 2025
Merged

Use specialized functions/macros to reduce code size in ext/random #18499

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions ext/random/randomizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ PHP_METHOD(Random_Randomizer, getBytes)
while (total_size + 8 <= length) {
result = engine.algo->generate(engine.state);
if (EG(exception)) {
zend_string_free(retval);
zend_string_efree(retval);
RETURN_THROWS();
}

Expand Down Expand Up @@ -326,7 +326,7 @@ PHP_METHOD(Random_Randomizer, getBytes)
while (total_size < length) {
result = engine.algo->generate(engine.state);
if (EG(exception)) {
zend_string_free(retval);
zend_string_efree(retval);
RETURN_THROWS();
}

Expand All @@ -342,7 +342,7 @@ PHP_METHOD(Random_Randomizer, getBytes)
}

ZSTR_VAL(retval)[length] = '\0';
RETURN_STR(retval);
RETURN_NEW_STR(retval);
}
/* }}} */

Expand Down Expand Up @@ -451,7 +451,7 @@ PHP_METHOD(Random_Randomizer, getBytesFromString)
uint64_t offset = engine.algo->range(engine.state, 0, max_offset);

if (EG(exception)) {
zend_string_free(retval);
zend_string_efree(retval);
RETURN_THROWS();
}

Expand All @@ -473,7 +473,7 @@ PHP_METHOD(Random_Randomizer, getBytesFromString)
while (total_size < length) {
php_random_result result = engine.algo->generate(engine.state);
if (EG(exception)) {
zend_string_free(retval);
zend_string_efree(retval);
RETURN_THROWS();
}

Expand All @@ -484,7 +484,7 @@ PHP_METHOD(Random_Randomizer, getBytesFromString)

if (offset > max_offset) {
if (++failures > PHP_RANDOM_RANGE_ATTEMPTS) {
zend_string_free(retval);
zend_string_efree(retval);
zend_throw_error(random_ce_Random_BrokenRandomEngineError, "Failed to generate an acceptable random number in %d attempts", PHP_RANDOM_RANGE_ATTEMPTS);
RETURN_THROWS();
}
Expand All @@ -503,7 +503,7 @@ PHP_METHOD(Random_Randomizer, getBytesFromString)
}

ZSTR_VAL(retval)[length] = '\0';
RETURN_STR(retval);
RETURN_NEW_STR(retval);
}
/* }}} */

Expand Down
Loading