diff options
| author | Xinchen Hui <laruence@php.net> | 2011-12-19 09:58:29 +0000 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2011-12-19 09:58:29 +0000 |
| commit | d589d33468e5c960d5a598dcb17017d38650793b (patch) | |
| tree | a21915b55706ea67e72afe8d9cf1101547bb7683 | |
| parent | c36926ba4cbf0c054eedcda9a8d91cb86529b664 (diff) | |
| download | php-git-d589d33468e5c960d5a598dcb17017d38650793b.tar.gz | |
Fixed bug #60558 (Invalid read and writes)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | Zend/zend_object_handlers.c | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -7,6 +7,7 @@ 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 d524c23faa..152a86243a 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -85,6 +85,7 @@ 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]); |