mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-13 20:05:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.0'

Browse Source
This commit is contained in:
Bob Weinand 2016-01-24 19:55:31 +01:00
commit 9017bb94d4
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Zend/tests/generators/bug71441.phpt Normal file
View File

@ -0,0 +1,29 @@
--TEST--
Bug #71441 (Typehinted Generator with return in try/finally crashes)
--FILE--
<?php
$num = 2000; /* to be sure to be in wild memory */
$add = str_repeat("1 +", $num);
$gen = (eval(<<<PHP
return function (): \Generator {
try {
\$a = 1;
\$foo = \$a + $add \$a;
return yield \$foo;
} finally {
print "Ok\n";
}
};
PHP
))();
var_dump($gen->current());
$gen->send("Success");
var_dump($gen->getReturn());
?>
--EXPECT--
int(2002)
Ok
string(7) "Success"

8
Zend/zend_opcode.c
View File

@ -696,9 +696,13 @@ ZEND_API int pass_two(zend_op_array *op_array)
case ZEND_VERIFY_RETURN_TYPE:
if (op_array->fn_flags & ZEND_ACC_GENERATOR) {
if (opline->op1_type != IS_UNUSED) {
(opline + 1)->op1 = opline->op1;
(opline + 1)->op1_type = opline->op1_type;
zend_op *ret = opline;
do ret++; while (ret->opcode != ZEND_RETURN);
ret->op1 = opline->op1;
ret->op1_type = opline->op1_type;
}
MAKE_NOP(opline);
}
break;