diff options
| author | Johannes Schlüter <johannes@php.net> | 2012-03-08 12:52:12 +0000 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2012-03-08 12:52:12 +0000 |
| commit | ecf87a96b9800dc97a6b39ca367213f0a738619b (patch) | |
| tree | 2240f3cea7b2af4fcf46e6b1ab30c5db2930e5b0 | |
| parent | b976ebad35532535098205be4beaa6266cdae0c1 (diff) | |
| download | php-git-ecf87a96b9800dc97a6b39ca367213f0a738619b.tar.gz | |
Use correct property ctor, should fix threading issue in bug #55334
# The code was refactored in 5_4/trunk, no need to merge
| -rw-r--r-- | ext/mysqli/mysqli.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |