summaryrefslogtreecommitdiff
path: root/Zend/zend_opcode.c
diff options
context:
space:
mode:
Diffstat (limited to 'Zend/zend_opcode.c')
-rw-r--r--Zend/zend_opcode.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index b8e850d629..6c61d1aafa 100644
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -162,16 +162,16 @@ static inline void cleanup_user_class_data(zend_class_entry *ce TSRMLS_DC)
zend_hash_apply(&ce->function_table, (apply_func_t) zend_cleanup_function_data_full TSRMLS_CC);
}
if (ce->static_members_table) {
+ zval *static_members = ce->static_members_table;
+ int count = ce->default_static_members_count;
int i;
- for (i = 0; i < ce->default_static_members_count; i++) {
- if (ce->static_members_table[i]) {
- zval *p = ce->static_members_table[i];
- ce->static_members_table[i] = NULL;
- zval_ptr_dtor(&p);
- }
+ ce->default_static_members_count = 0;
+ ce->default_static_members_table = ce->static_members_table = NULL;
+ for (i = 0; i < count; i++) {
+ zval_ptr_dtor(&static_members[i]);
}
- ce->static_members_table = NULL;
+ efree(static_members);
}
}