Skip to content

Unify ext/random unserialize errors with ext/date #9185

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

Unify ext/random unserialize errors with ext/date #9185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b032888
Unify ext/random unserialize errors with ext/date
TimWolla Jul 28, 2022
20a3788
Make `zend_read_property` silent in `Randomizer::__unserialize()`
TimWolla Jul 28, 2022
8bbcbfd
Insert the actual class name in the unserialization error of Engines
TimWolla Jul 29, 2022
2ac1e0d
Revert unserialization failure back to Exception from Error
TimWolla Jul 29, 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
6 changes: 3 additions & 3 deletions ext/random/engine_mt19937.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,19 +357,19 @@ PHP_METHOD(Random_Engine_Mt19937, __unserialize)
/* members */
t = zend_hash_index_find(d, 0);
if (!t || Z_TYPE_P(t) != IS_ARRAY) {
zend_throw_exception(NULL, "Incomplete or ill-formed serialization data", 0);
zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object", ZSTR_VAL(engine->std.ce->name));
RETURN_THROWS();
}
object_properties_load(&engine->std, Z_ARRVAL_P(t));

/* state */
t = zend_hash_index_find(d, 1);
if (!t || Z_TYPE_P(t) != IS_ARRAY) {
zend_throw_exception(NULL, "Incomplete or ill-formed serialization data", 0);
zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object", ZSTR_VAL(engine->std.ce->name));
RETURN_THROWS();
}
if (!engine->algo->unserialize(engine->status, Z_ARRVAL_P(t))) {
zend_throw_exception(NULL, "Engine unserialize failed", 0);
zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object", ZSTR_VAL(engine->std.ce->name));
RETURN_THROWS();
}
}
Expand Down
6 changes: 3 additions & 3 deletions ext/random/randomizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,14 +274,14 @@ PHP_METHOD(Random_Randomizer, __unserialize)

members_zv = zend_hash_index_find(d, 0);
if (!members_zv || Z_TYPE_P(members_zv) != IS_ARRAY) {
zend_throw_exception(NULL, "Incomplete or ill-formed serialization data", 0);
zend_throw_exception(NULL, "Invalid serialization data for Random\\Randomizer object", 0);
RETURN_THROWS();
}
object_properties_load(&randomizer->std, Z_ARRVAL_P(members_zv));

zengine = zend_read_property(randomizer->std.ce, &randomizer->std, "engine", strlen("engine"), 0, NULL);
zengine = zend_read_property(randomizer->std.ce, &randomizer->std, "engine", strlen("engine"), 1, NULL);
if (Z_TYPE_P(zengine) != IS_OBJECT || !instanceof_function(Z_OBJCE_P(zengine), random_ce_Random_Engine)) {
zend_throw_exception(NULL, "Incomplete or ill-formed serialization data", 0);
zend_throw_exception(NULL, "Invalid serialization data for Random\\Randomizer object", 0);
RETURN_THROWS();
}

Expand Down
16 changes: 8 additions & 8 deletions ext/random/tests/02_engine/all_serialize_error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ try {
?>
--EXPECT--
Random\Engine\Mt19937
Engine unserialize failed
Engine unserialize failed
Engine unserialize failed
Engine unserialize failed
Invalid serialization data for Random\Engine\Mt19937 object
Invalid serialization data for Random\Engine\Mt19937 object
Invalid serialization data for Random\Engine\Mt19937 object
Invalid serialization data for Random\Engine\Mt19937 object
Random\Engine\PcgOneseq128XslRr64
Engine unserialize failed
Engine unserialize failed
Invalid serialization data for Random\Engine\PcgOneseq128XslRr64 object
Invalid serialization data for Random\Engine\PcgOneseq128XslRr64 object
Random\Engine\Xoshiro256StarStar
Engine unserialize failed
Engine unserialize failed
Invalid serialization data for Random\Engine\Xoshiro256StarStar object
Invalid serialization data for Random\Engine\Xoshiro256StarStar object