]> granicus.if.org Git - php/commitdiff
Use correct property ctor, should fix threading issue in bug #55334
authorJohannes Schlüter <johannes@php.net>
Thu, 8 Mar 2012 12:52:12 +0000 (12:52 +0000)
committerJohannes Schlüter <johannes@php.net>
Thu, 8 Mar 2012 12:52:12 +0000 (12:52 +0000)
# The code was refactored in 5_4/trunk, no need to merge

ext/mysqli/mysqli.c

index 5784995bc7dd1be3264af0e833d2e844c14f48e5..08fcf1e75b2e3df7b3608e5bd8b4b15c843c7a25 100644 (file)
@@ -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 */