clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #70111 (Segfault when a function uses both an explicit return type and an explicit cast)

Browse Source
This commit is contained in:
Xinchen Hui 2015-07-22 22:43:30 +08:00
parent d6415ae473
commit 3e479ef424
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NEWS
View File

@ -1,9 +1,14 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
06 Aug 2015, PHP 7.0.0 Beta 3
- Core:
. Fixed bug #70106 (Inheritance by anonymous class). (Bob)
- Opcache:
. Fixed bug #70111 (Segfault when a function uses both an explicit return
type and an explicit cast). (Laruence)
23 Jul 2015, PHP 7.0.0 Beta 2
- Core:

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

@ -380,6 +380,20 @@ int zend_optimizer_replace_by_const(zend_op_array *op_array,
zval_dtor(val);
return 1;
}
case ZEND_VERIFY_RETURN_TYPE: {
zend_arg_info *ret_info = op_array->arg_info - 1;
ZEND_ASSERT((opline + 1)->opcode == ZEND_RETURN || (opline + 1)->opcode == ZEND_RETURN_BY_REF);
if (ret_info->class_name
|| ret_info->type_hint == IS_CALLABLE
|| !ZEND_SAME_FAKE_TYPE(ret_info->type_hint, Z_TYPE_P(val))
|| (op_array->fn_flags & ZEND_ACC_RETURN_REFERENCE)) {
zval_dtor(val);
return 0;
}
MAKE_NOP(opline);
zend_optimizer_update_op1_const(op_array, opline + 1, val);
return 1;
}
default:
break;
}

18
ext/opcache/tests/bug70111.phpt Normal file
View File

@ -0,0 +1,18 @@
--TEST--
Bug #70111 (Segfault when a function uses both an explicit return type and an explicit cast)
--INI--
opcache.enable=1
opcache.enable_cli=1
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
var_dump(foo());
function foo() : string {
return (string) 42;
}
?>
--EXPECT--
string(2) "42"