Fix another round of review comments

Author: kocsismate

Zend/zend_API.c

@@ -1630,11 +1630,11 @@ ZEND_API void object_properties_load(zend_object *object, HashTable *properties)
 			} else {
 				if (UNEXPECTED(object->ce->ce_flags & ZEND_ACC_NO_DYNAMIC_PROPERTIES)) {
 					zend_throw_error(NULL, "Cannot create dynamic property %s::$%s",
-						ZSTR_VAL(object->ce->name), zend_get_unmangled_property_name(key));
+						ZSTR_VAL(object->ce->name), property_info != ZEND_WRONG_PROPERTY_INFO ? zend_get_unmangled_property_name(key): "");
 					return;
 				} else if (!(object->ce->ce_flags & ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES)) {
 					zend_error(E_DEPRECATED, "Creation of dynamic property %s::$%s is deprecated",
-						ZSTR_VAL(object->ce->name), zend_get_unmangled_property_name(key));
+						ZSTR_VAL(object->ce->name), property_info != ZEND_WRONG_PROPERTY_INFO ? zend_get_unmangled_property_name(key): "");
 				}
 
 				if (!object->properties) {
@@ -1645,12 +1645,11 @@ ZEND_API void object_properties_load(zend_object *object, HashTable *properties)
 			}
 		} else {
 			if (UNEXPECTED(object->ce->ce_flags & ZEND_ACC_NO_DYNAMIC_PROPERTIES)) {
-				zend_throw_error(NULL, "Cannot create dynamic property %s::$%s",
-					ZSTR_VAL(object->ce->name), zend_get_unmangled_property_name(key));
+				zend_throw_error(NULL, "Cannot create dynamic property %s::$" ZEND_LONG_FMT, ZSTR_VAL(object->ce->name), h);
 				return;
 			} else if (!(object->ce->ce_flags & ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES)) {
-				zend_error(E_DEPRECATED, "Creation of dynamic property %s::$%s is deprecated",
-					ZSTR_VAL(object->ce->name), zend_get_unmangled_property_name(key));
+				zend_error(E_DEPRECATED, "Creation of dynamic property %s::$" ZEND_LONG_FMT " is deprecated",
+					ZSTR_VAL(object->ce->name), h);
 			}
 
 			if (!object->properties) {

ext/gmp/tests/gmp_dynamic_property.phpt

@@ -0,0 +1,24 @@
+--TEST--
+GH-9186 Dynamic property unserialization should trigger a deprecated notice
+--EXTENSIONS--
+gmp
+--FILE--
+<?php
+
+$g = new GMP();
+$g->{1} = 123;
+
+$serialized = serialize($g);
+var_dump(unserialize($serialized));
+
+?>
+--EXPECTF--
+Deprecated: Creation of dynamic property GMP::$1 is deprecated in %s on line %d
+
+Deprecated: Creation of dynamic property GMP::$1 is deprecated in %s on line %d
+object(GMP)#%d (%d) {
+  [1]=>
+  int(123)
+  ["num"]=>
+  string(1) "0"
+}

ext/random/randomizer.c

@@ -279,6 +279,7 @@ PHP_METHOD(Random_Randomizer, __unserialize)
 	}
 	object_properties_load(&randomizer->std, Z_ARRVAL_P(members_zv));
 	if (EG(exception)) {
+		zend_throw_exception(NULL, "Invalid serialization data for Random\\Randomizer object", 0);
 		RETURN_THROWS();
 	}
 

ext/standard/var_unserializer.re

@@ -645,6 +645,9 @@ declared_property:
 				} else if (!(obj->ce->ce_flags & ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES)) {
 					zend_error(E_DEPRECATED, "Creation of dynamic property %s::$%s is deprecated",
 						ZSTR_VAL(obj->ce->name), zend_get_unmangled_property_name(Z_STR_P(&key)));
+					if (EG(exception)) {
+						goto failure;
+					}
 				}
 
 				int ret = is_property_visibility_changed(obj->ce, &key);