From: Johannes Schlüter Date: Thu, 8 Mar 2012 12:52:12 +0000 (+0000) Subject: Use correct property ctor, should fix threading issue in bug #55334 X-Git-Tag: PHP-5.4.1-RC1~26^2~25 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ecf87a96b9800dc97a6b39ca367213f0a738619b;p=php Use correct property ctor, should fix threading issue in bug #55334 # The code was refactored in 5_4/trunk, no need to merge --- diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 5784995bc7..08fcf1e75b 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -502,7 +502,7 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry *class_ (void **) &intern->prop_handler); zend_object_std_init(&intern->zo, class_type TSRMLS_CC); - zend_hash_copy(intern->zo.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, + zend_hash_copy(intern->zo.properties, &class_type->default_properties, (copy_ctor_func_t) zval_property_ctor, (void *) &tmp, sizeof(zval *)); /* link object */