diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-03-21 15:43:53 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-03-21 15:43:53 +0400 |
| commit | 37db857734e1d01223e1ad2fb88424be7b1182f1 (patch) | |
| tree | 32f415e1e59610a1ce9e79758869a7c4b96ec62b | |
| parent | a3abf6f291b5bf4fcec472dce8781facb98ecf93 (diff) | |
| download | php-git-37db857734e1d01223e1ad2fb88424be7b1182f1.tar.gz | |
Fixed CV IS_INDIRECT support
| -rw-r--r-- | Zend/zend_execute.c | 8 |
1 files changed, 8 insertions, 0 deletions
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); |
