diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-25 13:02:34 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-25 13:02:34 +0400 |
| commit | 6ee86d0c29b323be83c1211a7ed4c2d0d550aad2 (patch) | |
| tree | 709129891dd641184f51a204e6bb25d19020aaf9 | |
| parent | 71dac3d54f8c3dd80d5669846601a6980a7c3067 (diff) | |
| download | php-git-6ee86d0c29b323be83c1211a7ed4c2d0d550aad2.tar.gz | |
Fixed dynamic properies table construction
| -rw-r--r-- | Zend/zend_object_handlers.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 5f68520644..1f9d5f24d0 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -100,7 +100,9 @@ ZEND_API void rebuild_object_properties(zend_object *zobj) /* {{{ */ prop_info->offset >= 0 && Z_TYPE(zobj->properties_table[prop_info->offset]) != IS_UNDEF) { zval *zv = zend_hash_add(zobj->properties, prop_info->name, &zobj->properties_table[prop_info->offset]); - ZVAL_INDIRECT(&zobj->properties_table[prop_info->offset], zv); + if (zv) { + ZVAL_INDIRECT(&zobj->properties_table[prop_info->offset], zv); + } } } } |