summaryrefslogtreecommitdiff
path: root/Zend/zend_API.c
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2010-08-12 17:27:16 +0000
committerSascha Schumann <sas@php.net>2010-08-12 17:27:16 +0000
commit984560f93d56d2c39943e19a3ae403bf2000f899 (patch)
treee4971b5169729cc7269aa2e41fb835861ee67a8f /Zend/zend_API.c
parentb6ffe2f92b7382d268f6f9114fff520e1ddd8270 (diff)
downloadphp-git-984560f93d56d2c39943e19a3ae403bf2000f899.tar.gz
separate properties of internal classes in ZTS mode fully,
otherwise multiple threads will modify the zvals' contents without any synchronisation.
Diffstat (limited to 'Zend/zend_API.c')
-rw-r--r--Zend/zend_API.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index c01f9e653d..163c19bbfc 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -952,7 +952,7 @@ ZEND_API int _object_and_properties_init(zval *arg, zend_class_entry *class_type
} else {
ALLOC_HASHTABLE_REL(object->properties);
zend_hash_init(object->properties, zend_hash_num_elements(&class_type->default_properties), NULL, ZVAL_PTR_DTOR, 0);
- zend_hash_copy(object->properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
+ zend_hash_copy(object->properties, &class_type->default_properties, zval_copy_property_ctor(class_type), (void *) &tmp, sizeof(zval *));
}
} else {
Z_OBJVAL_P(arg) = class_type->create_object(class_type TSRMLS_CC);