com php-src: Fixed CV IS_INDIRECT support: Zend/zend_ execute.c

Commit: 37db857734e1d01223e1ad2fb88424be7b1182f1 Author: Dmitry Stogov <dmitry@zend.com> Fri, 21 Mar 2014 15:43:53 +0400 Parents: a3abf6f291b5bf4fcec472dce8781facb98ecf93 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=37db857734e1d01223e1ad2fb88424be7b1182f1 Log: Fixed CV IS_INDIRECT support Changed paths: M Zend/zend_execute.c Diff: diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index ecbe67a..2258f75 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);