From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 25 Feb 2014 09:02:34 +0000 (+0400)
Subject: Fixed dynamic properies table construction
X-Git-Tag: POST_PHPNG_MERGE~412^2~538
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ee86d0c29b323be83c1211a7ed4c2d0d550aad2;p=php

Fixed dynamic properies table construction
---

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);
+						}
 					}
 				}
 			}