diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-11 22:36:41 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-03-01 15:13:15 +0100 |
| commit | e8579365181d8e61c00968715ed8be5ec151002d (patch) | |
| tree | d09eda5ab029ce67f3a79072c74bc66182dea4e6 /ext/opcache | |
| parent | 988c3f965923e5418b78ce69055f3eadd8ce4c89 (diff) | |
| download | php-git-e8579365181d8e61c00968715ed8be5ec151002d.tar.gz | |
Fixed bug #80805
Handle missing result_var in binary_op_result_type.
(cherry picked from commit 8446e2827585c37d0739f8d44fa8d359cbbb6551)
Diffstat (limited to 'ext/opcache')
| -rw-r--r-- | ext/opcache/Optimizer/zend_inference.c | 11 | ||||
| -rw-r--r-- | ext/opcache/tests/bug80805.phpt | 26 |
2 files changed, 33 insertions, 4 deletions
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c index 368f68108d..bd3dad34ad 100644 --- a/ext/opcache/Optimizer/zend_inference.c +++ b/ext/opcache/Optimizer/zend_inference.c @@ -2141,7 +2141,7 @@ static uint32_t assign_dim_result_type( /* For binary ops that have compound assignment operators */ static uint32_t binary_op_result_type( - zend_ssa *ssa, zend_uchar opcode, uint32_t t1, uint32_t t2, uint32_t result_var, + zend_ssa *ssa, zend_uchar opcode, uint32_t t1, uint32_t t2, int result_var, zend_long optimization_level) { uint32_t tmp = 0; uint32_t t1_type = (t1 & MAY_BE_ANY) | (t1 & MAY_BE_UNDEF ? MAY_BE_NULL : 0); @@ -2159,7 +2159,8 @@ static uint32_t binary_op_result_type( switch (opcode) { case ZEND_ADD: if (t1_type == MAY_BE_LONG && t2_type == MAY_BE_LONG) { - if (!ssa->var_info[result_var].has_range || + if (result_var < 0 || + !ssa->var_info[result_var].has_range || ssa->var_info[result_var].range.underflow || ssa->var_info[result_var].range.overflow) { /* may overflow */ @@ -2185,7 +2186,8 @@ static uint32_t binary_op_result_type( case ZEND_SUB: case ZEND_MUL: if (t1_type == MAY_BE_LONG && t2_type == MAY_BE_LONG) { - if (!ssa->var_info[result_var].has_range || + if (result_var < 0 || + !ssa->var_info[result_var].has_range || ssa->var_info[result_var].range.underflow || ssa->var_info[result_var].range.overflow) { /* may overflow */ @@ -2627,7 +2629,8 @@ static int zend_update_type_info(const zend_op_array *op_array, } tmp |= binary_op_result_type( - ssa, opline->extended_value, t1, t2, ssa_ops[i].op1_def, optimization_level); + ssa, opline->extended_value, t1, t2, + opline->opcode == ZEND_ASSIGN_OP ? ssa_ops[i].op1_def : -1, optimization_level); if (tmp & (MAY_BE_STRING|MAY_BE_ARRAY)) { tmp |= MAY_BE_RC1; } diff --git a/ext/opcache/tests/bug80805.phpt b/ext/opcache/tests/bug80805.phpt new file mode 100644 index 0000000000..65e4748e57 --- /dev/null +++ b/ext/opcache/tests/bug80805.phpt @@ -0,0 +1,26 @@ +--TEST-- +Bug #80805: create simple class and get error in opcache.so +--FILE-- +<?php + +class Test { + public int $foo; + public function __construct() + { + $this->foo = 2; + } + public function inc(): int + { + return $this->foo += 2; + } +} + +$test = new Test(); +var_dump($test->foo); +$test->inc(); +var_dump($test->foo); + +?> +--EXPECT-- +int(2) +int(4) |