]> granicus.if.org Git - php/commitdiff
Fixed dynamic properies table construction
authorDmitry Stogov <dmitry@zend.com>
Tue, 25 Feb 2014 09:02:34 +0000 (13:02 +0400)
committerDmitry Stogov <dmitry@zend.com>
Tue, 25 Feb 2014 09:02:34 +0000 (13:02 +0400)
Zend/zend_object_handlers.c

index 5f68520644db7cb698a9512f973bf73f7dba39a7..1f9d5f24d0520c62d33c05912c262c2e54d798f4 100644 (file)
@@ -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);
+                                               }
                                        }
                                }
                        }