com php-src: Fixed possible double free of class static members: Zend/zend_opcode.c

Commit: a7f1bf3ec5b9b7849bbde6730235c597c299bcd1 Author: Dmitry Stogov <dmitry@zend.com> Fri, 23 Jan 2015 17:10:05 +0300 Parents: 46e486ff3d15b5c4b10988fc8acf7884ea69279f Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a7f1bf3ec5b9b7849bbde6730235c597c299bcd1 Log: Fixed possible double free of class static members Changed paths: M Zend/zend_opcode.c Diff: diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index 9f25784..aa2abb2 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); } }