From ad553a7af237818f5d7690e97a03ffe66ec9ab37 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Mon, 10 Dec 2012 20:28:27 +0800 Subject: Fixed bug #63726 (Memleak with static properties and internal/user classes) --- NEWS | 2 ++ Zend/zend_API.c | 2 ++ Zend/zend_object_handlers.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/NEWS b/NEWS index 1ec60e3dfe..91306ca238 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,8 @@ PHP NEWS #### ADD NEWS TO 5.3.21 ONLY #### - Zend Engine: + . Fixed bug #63726 (Memleak with static properties and internal/user + classes). (Laruence) . Fixed bug #63635 (Segfault in gc_collect_cycles). (Dmitry) . Fixed bug #63512 (parse_ini_file() with INI_SCANNER_RAW removes quotes from value). (Pierrick) diff --git a/Zend/zend_API.c b/Zend/zend_API.c index c1b501b0b7..df11bdbe8f 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -3472,6 +3472,8 @@ ZEND_API int zend_update_static_property(zend_class_entry *scope, char *name, in (*property)->value = value->value; if (Z_REFCOUNT_P(value) > 0) { zval_copy_ctor(*property); + } else { + efree(value); } } else { zval *garbage = *property; diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index eae47d9c5a..c40a458238 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -437,6 +437,8 @@ static void zend_std_write_property(zval *object, zval *member, zval *value TSRM (*variable_ptr)->value = value->value; if (Z_REFCOUNT_P(value) > 0) { zval_copy_ctor(*variable_ptr); + } else { + efree(value); } zval_dtor(&garbage); } else { -- cgit v1.2.1