Enforce __set_state() parameter type

This fixes one of the issues reported in bug #79925. The parameter type check for this particular method was missed.
php · Aug 3, 2020 · 5d4659c · 5d4659c · ondrejmirtes · Aug 3, 2020
1 parent a4c015b
commit 5d4659c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/Zend/tests/magic_methods_020.phpt b/Zend/tests/magic_methods_020.phpt
@@ -0,0 +1,12 @@
+--TEST--
+__set_state first parameter must be an array
+--FILE--
+<?php
+
+class Foo {
+	public static function __set_state(int $properties) {}
+}
+
+?>
+--EXPECTF--
+Fatal error: Foo::__set_state(): Parameter #1 ($properties) must be of type array when declared in %s on line %d
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -2187,6 +2187,7 @@ ZEND_API void zend_check_magic_method_implementation(const zend_class_entry *ce,
 		zend_check_magic_method_args(1, ce, fptr, error_type);
 		zend_check_magic_method_static(ce, fptr, error_type);
 		zend_check_magic_method_public(ce, fptr, error_type);
+		zend_check_magic_method_arg_type(0, ce, fptr, error_type, MAY_BE_ARRAY);
 		zend_check_magic_method_return_type(ce, fptr, error_type, MAY_BE_OBJECT);
 	} else if (zend_string_equals_literal(lcname, "__invoke")) {
 		zend_check_magic_method_non_static(ce, fptr, error_type);