diff options
Diffstat (limited to 'Zend/zend_objects.c')
| -rw-r--r-- | Zend/zend_objects.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index 8ba1f5a78d..60e446b4fd 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -32,7 +32,6 @@ ZEND_API void zend_object_std_init(zend_object *object, zend_class_entry *ce) GC_TYPE_INFO(object) = IS_OBJECT; object->ce = ce; object->properties = NULL; - object->guards = NULL; zend_objects_store_put(object); if (EXPECTED(ce->default_properties_count != 0)) { zval *p = object->properties_table; @@ -43,16 +42,17 @@ ZEND_API void zend_object_std_init(zend_object *object, zend_class_entry *ce) p++; } while (p != end); } + if (ce->ce_flags & ZEND_ACC_USE_GUARDS) { + GC_FLAGS(object) |= IS_OBJ_USE_GUARDS; + ZVAL_UNDEF(&object->properties_table[ce->default_properties_count]); + Z_PTR(object->properties_table[ce->default_properties_count]) = NULL; + } } ZEND_API void zend_object_std_dtor(zend_object *object) { int i, count; - if (object->guards) { - zend_hash_destroy(object->guards); - FREE_HASHTABLE(object->guards); - } if (object->properties) { zend_array_destroy(object->properties); FREE_HASHTABLE(object->properties); @@ -61,6 +61,13 @@ ZEND_API void zend_object_std_dtor(zend_object *object) for (i = 0; i < count; i++) { i_zval_ptr_dtor(&object->properties_table[i] ZEND_FILE_LINE_CC); } + if (GC_FLAGS(object) & IS_OBJ_HAS_GUARDS) { + HashTable *guards = Z_PTR(object->properties_table[count]); + + ZEND_ASSERT(guards != NULL); + zend_hash_destroy(guards); + FREE_HASHTABLE(guards); + } } ZEND_API void zend_objects_destroy_object(zend_object *object) @@ -131,7 +138,7 @@ ZEND_API void zend_objects_destroy_object(zend_object *object) ZEND_API zend_object *zend_objects_new(zend_class_entry *ce) { - zend_object *object = emalloc(sizeof(zend_object) + sizeof(zval) * (ce->default_properties_count - 1)); + zend_object *object = emalloc(sizeof(zend_object) + zend_object_properties_size(ce)); zend_object_std_init(object, ce); object->handlers = &std_object_handlers; |