]> granicus.if.org Git - php/commitdiff
Fixed CV IS_INDIRECT support
authorDmitry Stogov <dmitry@zend.com>
Fri, 21 Mar 2014 11:43:53 +0000 (15:43 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 21 Mar 2014 11:43:53 +0000 (15:43 +0400)
Zend/zend_execute.c

index ecbe67ab99bd16815cb11368b72a9bffc5a8cdf6..2258f75ab359e6ceb2981de51023feb9640c9e54 100644 (file)
@@ -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);