Skip to content

Check Serialization magic methods structure #5441

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

Closed
wants to merge 1 commit into from
Closed

Check Serialization magic methods structure #5441

Show file tree
Hide file tree
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
12 changes: 12 additions & 0 deletions Zend/tests/magic_methods_serialize.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
--TEST--
__serialize declaration
--FILE--
<?php
class Foo {
static function __serialize($arguments) {}
}
?>
--EXPECTF--
Warning: The magic method Foo::__serialize() must have public visibility and cannot be static in %s on line %d

Fatal error: Method Foo::__serialize() cannot take arguments in %s on line %d
12 changes: 12 additions & 0 deletions Zend/tests/magic_methods_unserialize.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
--TEST--
__unserialize declaration
--FILE--
<?php
class Foo {
static function __unserialize($data, $value) {}
}
?>
--EXPECTF--
Warning: The magic method Foo::__unserialize() must have public visibility and cannot be static in %s on line %d

Fatal error: Method Foo::__unserialize() must take exactly 1 argument in %s on line %d
12 changes: 12 additions & 0 deletions Zend/zend_API.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2023,6 +2023,18 @@ ZEND_API void zend_check_magic_method_implementation(const zend_class_entry *ce,
} else if (name_len == sizeof(ZEND_DEBUGINFO_FUNC_NAME) - 1 &&
!memcmp(lcname, ZEND_DEBUGINFO_FUNC_NAME, sizeof(ZEND_DEBUGINFO_FUNC_NAME)-1) && fptr->common.num_args != 0) {
zend_error(error_type, "Method %s::__debugInfo() cannot take arguments", ZSTR_VAL(ce->name));
} else if (
name_len == sizeof("__serialize") - 1
&& !memcmp(lcname, "__serialize", sizeof("__serialize") - 1)
&& fptr->common.num_args != 0
) {
zend_error(error_type, "Method %s::__serialize() cannot take arguments", ZSTR_VAL(ce->name));
} else if (
name_len == sizeof("__unserialize") - 1
&& !memcmp(lcname, "__unserialize", sizeof("__unserialize") - 1)
&& fptr->common.num_args != 1
) {
zend_error(error_type, "Method %s::__unserialize() must take exactly 1 argument", ZSTR_VAL(ce->name));
}
}
/* }}} */
Expand Down
4 changes: 4 additions & 0 deletions Zend/zend_compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6173,6 +6173,10 @@ void zend_begin_method_decl(zend_op_array *op_array, zend_string *name, zend_boo
} else if (zend_string_equals_literal(lcname, ZEND_DEBUGINFO_FUNC_NAME)) {
zend_check_magic_method_attr(fn_flags, ce, "__debugInfo", 0);
ce->__debugInfo = (zend_function *) op_array;
} else if (zend_string_equals_literal(lcname, "__serialize")) {
zend_check_magic_method_attr(fn_flags, ce, "__serialize", 0);
} else if (zend_string_equals_literal(lcname, "__unserialize")) {
zend_check_magic_method_attr(fn_flags, ce, "__unserialize", 0);
}

zend_string_release_ex(lcname, 0);
Expand Down