Skip to content

[%pS migration] Use %pS in ext/random #23167

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

Draft
DanielEScherzer wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −5
Draft

[%pS migration] Use %pS in ext/random #23167

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
10 changes: 5 additions & 5 deletions ext/random/engine_mt19937.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,30 +348,30 @@ PHP_METHOD(Random_Engine_Mt19937, __unserialize)

/* Verify the expected number of elements, this implicitly ensures that no additional elements are present. */
if (zend_hash_num_elements(d) != 2) {
zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object", ZSTR_VAL(engine->std.ce->name));
zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %pS object", engine->std.ce->name);
RETURN_THROWS();
}

/* members */
t = zend_hash_index_find(d, 0);
if (!t || Z_TYPE_P(t) != IS_ARRAY) {
zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object", ZSTR_VAL(engine->std.ce->name));
zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %pS object", engine->std.ce->name);
RETURN_THROWS();
}
object_properties_load(&engine->std, Z_ARRVAL_P(t));
if (EG(exception)) {
zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object", ZSTR_VAL(engine->std.ce->name));
zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %pS object", engine->std.ce->name);
RETURN_THROWS();
}

/* state */
t = zend_hash_index_find(d, 1);
if (!t || Z_TYPE_P(t) != IS_ARRAY) {
zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object", ZSTR_VAL(engine->std.ce->name));
zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %pS object", engine->std.ce->name);
RETURN_THROWS();
}
if (!engine->engine.algo->unserialize(engine->engine.state, Z_ARRVAL_P(t))) {
zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object", ZSTR_VAL(engine->std.ce->name));
zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %pS object", engine->std.ce->name);
RETURN_THROWS();
}
}
Expand Down
Loading