From 7fcba87e68eed20aa767041b625ccc65d0913869 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Mon, 19 Dec 2011 12:00:09 +0000 Subject: [PATCH] Revert previous bad fix, introduce memory leak --- NEWS | 1 - Zend/zend_object_handlers.c | 1 - 2 files changed, 2 deletions(-) diff --git a/NEWS b/NEWS index 79c2f2f2acd..8ae70e81ebd 100644 --- a/NEWS +++ b/NEWS @@ -7,7 +7,6 @@ PHP NEWS . Fixed bug #60536 (Traits Segfault). (Laruence) . Fixed bug #60362 (non-existent sub-sub keys should not have values). (Laruence, alan_k, Stas) - . Fixed bug #60558 (Invalid read and writes). (Laruence) - CLI SAPI: . Fixed bug #60477 (Segfault after two multipart/form-data POST requests, diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 152a86243a6..d524c23faa3 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -85,7 +85,6 @@ ZEND_API void rebuild_object_properties(zend_object *zobj) /* {{{ */ prop_info->offset >= 0 && zobj->properties_table[prop_info->offset]) { if (UNEXPECTED(flags[prop_info->offset])) { - Z_ADDREF_P(*(zval **)zobj->properties_table[prop_info->offset]); zend_hash_quick_add(zobj->properties, prop_info->name, prop_info->name_length+1, prop_info->h, (void**)zobj->properties_table[prop_info->offset], sizeof(zval*), (void**)&zobj->properties_table[prop_info->offset]); } else { zend_hash_quick_add(zobj->properties, prop_info->name, prop_info->name_length+1, prop_info->h, (void**)&zobj->properties_table[prop_info->offset], sizeof(zval*), (void**)&zobj->properties_table[prop_info->offset]);