diff options
| author | Ondřej Surý <ondrej@sury.org> | 2012-04-13 14:53:37 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2012-04-13 14:53:37 +0200 |
| commit | e0dcba421c579b36da678d886e1673be84225ae8 (patch) | |
| tree | ccba89ef21e71cadedce7ec14d18f67e08ea0882 /Zend | |
| parent | 7b10b0041aa63c6f8990ceb3ccc190bdd9eea2b9 (diff) | |
| download | php-e0dcba421c579b36da678d886e1673be84225ae8.tar.gz | |
Imported Upstream version 5.4.1~rc2upstream/5.4.1_rc2
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_API.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 71feccf9f..98a33e544 100644 --- 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; |