diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-01-23 17:10:05 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-01-23 17:10:05 +0300 |
| commit | a7f1bf3ec5b9b7849bbde6730235c597c299bcd1 (patch) | |
| tree | 5a0e0cede689ecb9ea5f5924e2d314f478b8f1f2 /Zend/zend_opcode.c | |
| parent | 46e486ff3d15b5c4b10988fc8acf7884ea69279f (diff) | |
| download | php-git-a7f1bf3ec5b9b7849bbde6730235c597c299bcd1.tar.gz | |
Fixed possible double free of class static members
Diffstat (limited to 'Zend/zend_opcode.c')
| -rw-r--r-- | Zend/zend_opcode.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index 9f25784940..aa2abb2f6b 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -151,13 +151,15 @@ ZEND_API void zend_cleanup_user_class_data(zend_class_entry *ce) } if (ce->static_members_table) { zval *static_members = ce->static_members_table; + int count = ce->default_static_members_count; int i; - ce->static_members_table = NULL; - for (i = 0; i < ce->default_static_members_count; i++) { + 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]); - ZVAL_UNDEF(&static_members[i]); } + efree(static_members); } } |