From 6ee86d0c29b323be83c1211a7ed4c2d0d550aad2 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 25 Feb 2014 13:02:34 +0400 Subject: [PATCH] Fixed dynamic properies table construction --- Zend/zend_object_handlers.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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); + } } } } -- 2.50.1