Skip to content

Clean up nested exceptions without value-add in ext/random #9211

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 7 commits into from
Aug 2, 2022
Merged

Clean up nested exceptions without value-add in ext/random #9211

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6903a2a
Remove exception in Randomizer::shuffleBytes()
TimWolla Jul 31, 2022
1d661f8
Remove exception in Randomizer::shuffleArray()
TimWolla Jul 31, 2022
1c9b3c6
Remove exception in Randomizer::getInt()
TimWolla Jul 31, 2022
6d8b54b
Remove exception in Randomizer::nextInt()
TimWolla Aug 1, 2022
21e1a0d
Remove exception in Randomizer::getBytes()
TimWolla Jul 31, 2022
1b39d5e
Remove exception in Mt19937::generate()
TimWolla Jul 31, 2022
e6786e9
[ci skip] Add cleanup of Randomizer exceptions to NEWS
TimWolla Jul 31, 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
1 change: 0 additions & 1 deletion ext/random/engine_mt19937.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,6 @@ PHP_METHOD(Random_Engine_Mt19937, generate)
generated = engine->algo->generate(engine->status);
size = engine->status->last_generated_size;
if (EG(exception)) {
zend_throw_exception(spl_ce_RuntimeException, "Random number generation failed", 0);
RETURN_THROWS();
}

Expand Down
11 changes: 3 additions & 8 deletions ext/random/randomizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,11 @@ PHP_METHOD(Random_Randomizer, nextInt)
ZEND_PARSE_PARAMETERS_NONE();

result = randomizer->algo->generate(randomizer->status);
if (randomizer->status->last_generated_size > sizeof(zend_long)) {
zend_throw_exception(spl_ce_RuntimeException, "Generated value exceeds size of int", 0);
if (EG(exception)) {
RETURN_THROWS();
}
if (EG(exception)) {
zend_throw_exception(spl_ce_RuntimeException, "Random number generation failed", 0);
if (randomizer->status->last_generated_size > sizeof(zend_long)) {
zend_throw_exception(spl_ce_RuntimeException, "Generated value exceeds size of int", 0);
RETURN_THROWS();
}

Expand All @@ -132,7 +131,6 @@ PHP_METHOD(Random_Randomizer, getInt)

result = randomizer->algo->range(randomizer->status, min, max);
if (EG(exception)) {
zend_throw_exception(spl_ce_RuntimeException, "Random number generation failed", 0);
RETURN_THROWS();
}

Expand Down Expand Up @@ -165,7 +163,6 @@ PHP_METHOD(Random_Randomizer, getBytes)
result = randomizer->algo->generate(randomizer->status);
if (EG(exception)) {
zend_string_free(retval);
zend_throw_exception(spl_ce_RuntimeException, "Random number generation failed", 0);
RETURN_THROWS();
}
for (size_t i = 0; i < randomizer->status->last_generated_size; i++) {
Expand Down Expand Up @@ -193,7 +190,6 @@ PHP_METHOD(Random_Randomizer, shuffleArray)

ZVAL_DUP(return_value, array);
if (!php_array_data_shuffle(randomizer->algo, randomizer->status, return_value)) {
zend_throw_exception(spl_ce_RuntimeException, "Random number generation failed", 0);
RETURN_THROWS();
}
}
Expand All @@ -215,7 +211,6 @@ PHP_METHOD(Random_Randomizer, shuffleBytes)

RETVAL_STRINGL(ZSTR_VAL(bytes), ZSTR_LEN(bytes));
if (!php_binary_string_shuffle(randomizer->algo, randomizer->status, Z_STRVAL_P(return_value), (zend_long) Z_STRLEN_P(return_value))) {
zend_throw_exception(spl_ce_RuntimeException, "Random number generation failed", 0);
RETURN_THROWS();
}
}
Expand Down
5 changes: 0 additions & 5 deletions ext/random/tests/03_randomizer/user_throws.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,4 @@ Stack trace:
#0 [internal function]: Random\Engine@anonymous->generate()
#1 %s(%d): Random\Randomizer->getBytes(1)
#2 {main}

Next RuntimeException: Random number generation failed in %s:%d
Stack trace:
#0 %s(%d): Random\Randomizer->getBytes(1)
#1 {main}
thrown in %s on line %d
60 changes: 22 additions & 38 deletions ext/random/tests/03_randomizer/user_unsafe.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ final class EmptyStringEngine implements \Random\Engine {
final class HeavilyBiasedEngine implements \Random\Engine {
public function generate(): string
{
return "\xff\xff\xff\xff\xff\xff\xff\xff";
return \str_repeat("\xff", PHP_INT_SIZE);
}
}

Expand All @@ -32,25 +32,33 @@ foreach ([
} catch (Throwable $e) {
echo $e, PHP_EOL;
}

echo PHP_EOL, "-------", PHP_EOL, PHP_EOL;


try {
var_dump((new Randomizer(new $engine()))->nextInt());
} catch (Throwable $e) {
echo $e, PHP_EOL;
}

echo PHP_EOL, "-------", PHP_EOL, PHP_EOL;

try {
var_dump(bin2hex((new Randomizer(new $engine()))->getBytes(1)));
} catch (Throwable $e) {
echo $e, PHP_EOL;
}

echo PHP_EOL, "-------", PHP_EOL, PHP_EOL;

try {
var_dump((new Randomizer(new $engine()))->shuffleArray(\range(1, 10)));
} catch (Throwable $e) {
echo $e, PHP_EOL;
}

echo PHP_EOL, "-------", PHP_EOL, PHP_EOL;

try {
var_dump((new Randomizer(new $engine()))->shuffleBytes('foobar'));
} catch (Throwable $e) {
Expand All @@ -71,19 +79,16 @@ Stack trace:
#0 %s(%d): Random\Randomizer->getInt(0, 123)
#1 {main}

Next RuntimeException: Random number generation failed in %s:%d
Stack trace:
#0 %s(%d): Random\Randomizer->getInt(0, 123)
#1 {main}

-------

Error: A random engine must return a non-empty string in %s:%d
Stack trace:
#0 %s(%d): Random\Randomizer->getBytes(1)
#0 %s(%d): Random\Randomizer->nextInt()
#1 {main}

Next RuntimeException: Random number generation failed in %s:%d
-------

Error: A random engine must return a non-empty string in %s:%d
Stack trace:
#0 %s(%d): Random\Randomizer->getBytes(1)
#1 {main}
Expand All @@ -95,23 +100,13 @@ Stack trace:
#0 %s(%d): Random\Randomizer->shuffleArray(Array)
#1 {main}

Next RuntimeException: Random number generation failed in %s:%d
Stack trace:
#0 %s(%d): Random\Randomizer->shuffleArray(Array)
#1 {main}

-------

Error: A random engine must return a non-empty string in %s:%d
Stack trace:
#0 %s(%d): Random\Randomizer->shuffleBytes('foobar')
#1 {main}

Next RuntimeException: Random number generation failed in %s:%d
Stack trace:
#0 %s(%d): Random\Randomizer->shuffleBytes('foobar')
#1 {main}

=====================
HeavilyBiasedEngine
=====================
Expand All @@ -121,10 +116,9 @@ Stack trace:
#0 %s(%d): Random\Randomizer->getInt(0, 123)
#1 {main}

Next RuntimeException: Random number generation failed in %s:%d
Stack trace:
#0 %s(%d): Random\Randomizer->getInt(0, 123)
#1 {main}
-------

int(%d)

-------

Expand All @@ -137,21 +131,11 @@ Stack trace:
#0 %s(%d): Random\Randomizer->shuffleArray(Array)
#1 {main}

Next RuntimeException: Random number generation failed in %s:%d
Stack trace:
#0 %s(%d): Random\Randomizer->shuffleArray(Array)
#1 {main}

-------

Error: Failed to generate an acceptable random number in 50 attempts in %s:%d
Stack trace:
#0 %s(%d): Random\Randomizer->shuffleBytes('foobar')
#1 {main}

Next RuntimeException: Random number generation failed in %s:%d
Stack trace:
#0 %s(%d): Random\Randomizer->shuffleBytes('foobar')
#1 {main}

=====================