diff options
| author | Xinchen Hui <laruence@php.net> | 2013-08-06 15:39:33 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-08-06 15:39:33 +0800 |
| commit | aa042d0c351056d4ee5ecc994cd596f7fbb427ea (patch) | |
| tree | 80ffaa479f52cc6d71f25293e92bbdddd7f978f8 /Zend/zend_vm_execute.h | |
| parent | 6e505f496905529a7976f0873a69fc222fe2d617 (diff) | |
| parent | a831499b4a1029118dc45375e62af42043110ade (diff) | |
| download | php-git-aa042d0c351056d4ee5ecc994cd596f7fbb427ea.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Diffstat (limited to 'Zend/zend_vm_execute.h')
| -rw-r--r-- | Zend/zend_vm_execute.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 98696bdf95..78d6e921cd 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -2414,6 +2414,7 @@ static int ZEND_FASTCALL ZEND_RETURN_BY_REF_SPEC_CONST_HANDLER(ZEND_OPCODE_HAND ALLOC_ZVAL(ret); INIT_PZVAL_COPY(ret, *retval_ptr_ptr); + zval_copy_ctor(ret); *EG(return_value_ptr_ptr) = ret; } break; @@ -7741,6 +7742,7 @@ static int ZEND_FASTCALL ZEND_RETURN_BY_REF_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLE ALLOC_ZVAL(ret); INIT_PZVAL_COPY(ret, *retval_ptr_ptr); + zval_copy_ctor(ret); *EG(return_value_ptr_ptr) = ret; } break; @@ -12969,6 +12971,7 @@ static int ZEND_FASTCALL ZEND_RETURN_BY_REF_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLE ALLOC_ZVAL(ret); INIT_PZVAL_COPY(ret, *retval_ptr_ptr); + zval_copy_ctor(ret); *EG(return_value_ptr_ptr) = ret; } break; @@ -30615,6 +30618,7 @@ static int ZEND_FASTCALL ZEND_RETURN_BY_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER ALLOC_ZVAL(ret); INIT_PZVAL_COPY(ret, *retval_ptr_ptr); + zval_copy_ctor(ret); *EG(return_value_ptr_ptr) = ret; } break; |