diff options
| author | Nikita Popov <nikic@php.net> | 2015-04-14 16:36:09 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-04-14 16:36:36 +0200 |
| commit | ed7e6d4758b8a8999b5e29e144e394782d473654 (patch) | |
| tree | e2a82c636c253731281929fa64061843ebefc769 | |
| parent | e8fb5201ba204cc59104db49f45737385abe139e (diff) | |
| parent | 95650d0942c99db8c247797d2ce708a586298ae9 (diff) | |
| download | php-git-ed7e6d4758b8a8999b5e29e144e394782d473654.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | Zend/tests/generators/bug69419.phpt | 22 | ||||
| -rw-r--r-- | Zend/zend_vm_def.h | 6 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 6 |
4 files changed, 30 insertions, 6 deletions
@@ -9,6 +9,8 @@ PHP NEWS . Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer). (Dmitry) . Fixed bug #68652 (segmentation fault in destructor). (Dmitry) + . Fixed bug #69419 (Returning compatible sub generator produces a warning). + (Nikita) - ODBC: . Fixed bug #69354 (Incorrect use of SQLColAttributes with ODBC 3.0). diff --git a/Zend/tests/generators/bug69419.phpt b/Zend/tests/generators/bug69419.phpt new file mode 100644 index 0000000000..dce08edb7e --- /dev/null +++ b/Zend/tests/generators/bug69419.phpt @@ -0,0 +1,22 @@ +--TEST-- +Bug #69419: Returning compatible sub generator produces a warning +--FILE-- +<?php + +function & genRefInner() { + $var = 1; + yield $var; +} + +function & genRefOuter() { + return genRefInner(); +} + +foreach(genRefOuter() as $i) { + var_dump($i); +} + +?> +--EXPECTF-- +Notice: Only variable references should be returned by reference in %s on line %d +int(1) diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 0fed90214d..6f55e64bca 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1995,13 +1995,12 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY) EX_T(opline->result.var).var.ptr = NULL; } } else if (fbc->type == ZEND_USER_FUNCTION) { + temp_variable *ret = &EX_T(opline->result.var); EX(original_return_value) = EG(return_value_ptr_ptr); EG(active_symbol_table) = NULL; EG(active_op_array) = &fbc->op_array; EG(return_value_ptr_ptr) = NULL; if (RETURN_VALUE_USED(opline)) { - temp_variable *ret = &EX_T(opline->result.var); - ret->var.ptr = NULL; EG(return_value_ptr_ptr) = &ret->var.ptr; ret->var.ptr_ptr = &ret->var.ptr; @@ -2010,7 +2009,8 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY) if (UNEXPECTED((EG(active_op_array)->fn_flags & ZEND_ACC_GENERATOR) != 0)) { if (RETURN_VALUE_USED(opline)) { - EX_T(opline->result.var).var.ptr = zend_generator_create_zval(EG(active_op_array) TSRMLS_CC); + ret->var.ptr = zend_generator_create_zval(EG(active_op_array) TSRMLS_CC); + ret->var.fcall_returned_reference = 0; } } else if (EXPECTED(zend_execute_ex == execute_ex)) { if (EXPECTED(EG(exception) == NULL)) { diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index eaa22a6205..64ff29a159 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -567,13 +567,12 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR EX_T(opline->result.var).var.ptr = NULL; } } else if (fbc->type == ZEND_USER_FUNCTION) { + temp_variable *ret = &EX_T(opline->result.var); EX(original_return_value) = EG(return_value_ptr_ptr); EG(active_symbol_table) = NULL; EG(active_op_array) = &fbc->op_array; EG(return_value_ptr_ptr) = NULL; if (RETURN_VALUE_USED(opline)) { - temp_variable *ret = &EX_T(opline->result.var); - ret->var.ptr = NULL; EG(return_value_ptr_ptr) = &ret->var.ptr; ret->var.ptr_ptr = &ret->var.ptr; @@ -582,7 +581,8 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR if (UNEXPECTED((EG(active_op_array)->fn_flags & ZEND_ACC_GENERATOR) != 0)) { if (RETURN_VALUE_USED(opline)) { - EX_T(opline->result.var).var.ptr = zend_generator_create_zval(EG(active_op_array) TSRMLS_CC); + ret->var.ptr = zend_generator_create_zval(EG(active_op_array) TSRMLS_CC); + ret->var.fcall_returned_reference = 0; } } else if (EXPECTED(zend_execute_ex == execute_ex)) { if (EXPECTED(EG(exception) == NULL)) { |