diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-11-29 01:45:54 +0000 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-11-29 01:45:54 +0000 |
| commit | 01554bf3e417f13baf7af874e449c265c0309279 (patch) | |
| tree | 8aca46ab27a54cea34c14001af774942f0502e39 /Zend/zend_objects.c | |
| parent | 65c8edd525108f6598a8bb25fb3c5d6c80233322 (diff) | |
| parent | 719083bd943e6c287c2dcb47918cf51f89a4ac08 (diff) | |
| download | php-git-01554bf3e417f13baf7af874e449c265c0309279.tar.gz | |
Merge branch 'master' into zppFailOnOverflow
Diffstat (limited to 'Zend/zend_objects.c')
| -rw-r--r-- | Zend/zend_objects.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index 58c034163e..2778b168ee 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -47,18 +47,19 @@ ZEND_API void zend_object_std_init(zend_object *object, zend_class_entry *ce TSR ZEND_API void zend_object_std_dtor(zend_object *object TSRMLS_DC) { - int i; + int i, count; if (object->guards) { zend_hash_destroy(object->guards); FREE_HASHTABLE(object->guards); } if (object->properties) { - zend_hash_destroy(object->properties); + zend_array_destroy(object->properties TSRMLS_CC); FREE_HASHTABLE(object->properties); } - for (i = 0; i < object->ce->default_properties_count; i++) { - zval_ptr_dtor(&object->properties_table[i]); + count = object->ce->default_properties_count; + for (i = 0; i < count; i++) { + i_zval_ptr_dtor(&object->properties_table[i] ZEND_FILE_LINE_CC TSRMLS_CC); } } |