clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.1'

Browse Source
This commit is contained in:
Nikita Popov 2016-12-05 20:41:21 +01:00
commit 795cd6d3a7
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext/opcache/Optimizer/zend_optimizer.c
View File

@ -200,6 +200,11 @@ int zend_optimizer_update_op1_const(zend_op_array *op_array,
case ZEND_SEND_VAR_NO_REF_EX:
zval_ptr_dtor(val);
return 0;
case ZEND_VERIFY_RETURN_TYPE:
/* This would require a non-local change.
* zend_optimizer_replace_by_const() supports this. */
zval_ptr_dtor(val);
return 0;
case ZEND_CONCAT:
case ZEND_FAST_CONCAT:
case ZEND_FETCH_R:

17
ext/opcache/tests/bug73654.phpt Normal file
View File

@ -0,0 +1,17 @@
--TEST--
Bug #73654: Segmentation fault in zend_call_function
--FILE--
<?php
echo xyz();
function x () : string {
return 'x';
}
function xyz() : string {
return x().'yz';
}
?>
--EXPECT--
xyz