From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 21 Mar 2014 11:43:53 +0000 (+0400)
Subject: Fixed CV IS_INDIRECT support
X-Git-Tag: POST_PHPNG_MERGE~412^2~244
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=37db857734e1d01223e1ad2fb88424be7b1182f1;p=php

Fixed CV IS_INDIRECT support
---

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index ecbe67ab99..2258f75ab3 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -774,6 +774,10 @@ static inline void zend_assign_to_object(zval *retval, zval *object_ptr, zval *p
 				}
 				Z_ADDREF_P(object);
 				zend_error(E_WARNING, "Creating default object from empty value");
+//???
+				if (Z_TYPE_P(object) == IS_INDIRECT); {
+					object = Z_INDIRECT_P(object);
+				}
 				if (Z_REFCOUNT_P(object) == 1) {
 					/* object was removed by error handler, nothing to assign to */
 					zval_ptr_dtor(object);
@@ -786,6 +790,10 @@ static inline void zend_assign_to_object(zval *retval, zval *object_ptr, zval *p
 				Z_DELREF_P(object);
 			} else {
 				zend_error(E_WARNING, "Creating default object from empty value");
+//???
+				if (Z_TYPE_P(object) == IS_INDIRECT); {
+					object = Z_INDIRECT_P(object);
+				}
 			}
 			zval_dtor(object);
 			object_init(object);