Copy default properties of internal classes for different threads

johannes · smalyshev · commit ea3e0d5a7370 · 2012-04-11T20:21:59.000-07:00
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -1093,7 +1093,12 @@ ZEND_API void object_properties_init(zend_object *object, zend_class_entry *clas
 		for (i = 0; i < class_type->default_properties_count; i++) {
 			object->properties_table[i] = class_type->default_properties_table[i];
 			if (class_type->default_properties_table[i]) {
+#if ZTS
+				ALLOC_ZVAL( object->properties_table[i]);
+				MAKE_COPY_ZVAL(&class_type->default_properties_table[i], object->properties_table[i]);
+#else
 				Z_ADDREF_P(object->properties_table[i]);
+#endif
 			}
 		}
 		object->properties = NULL;

Original file line number	Diff line number	Diff line change
`@@ -1093,7 +1093,12 @@ ZEND_API void object_properties_init(zend_object object, zend_class_entry clas`
`1093`	`1093`	`for (i = 0; i < class_type->default_properties_count; i++) {`
`1094`	`1094`	`object->properties_table[i] = class_type->default_properties_table[i];`
`1095`	`1095`	`if (class_type->default_properties_table[i]) {`
	`1096`	`+#if ZTS`
	`1097`	`+ ALLOC_ZVAL( object->properties_table[i]);`
	`1098`	`+ MAKE_COPY_ZVAL(&class_type->default_properties_table[i], object->properties_table[i]);`
	`1099`	`+#else`
`1096`	`1100`	`Z_ADDREF_P(object->properties_table[i]);`
	`1101`	`+#endif`
`1097`	`1102`	`}`
`1098`	`1103`	`}`
`1099`	`1104`	`object->properties = NULL;`