1
0
mirror of https://github.com/php/php-src.git synced 2026-04-04 06:32:49 +02:00

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed incorrect overflow detection
This commit is contained in:
Dmitry Stogov
2020-02-27 23:38:19 +03:00

View File

@@ -2725,10 +2725,10 @@ static int zend_update_type_info(const zend_op_array *op_array,
}
if ((t1 & (MAY_BE_ANY|MAY_BE_UNDEF)) == MAY_BE_LONG) {
if (!ssa_var_info[ssa_ops[i].op1_use].has_range ||
(opline->opcode == ZEND_PRE_DEC &&
(opline->opcode == ZEND_POST_DEC &&
(ssa_var_info[ssa_ops[i].op1_use].range.underflow ||
ssa_var_info[ssa_ops[i].op1_use].range.min == ZEND_LONG_MIN)) ||
(opline->opcode == ZEND_PRE_INC &&
(opline->opcode == ZEND_POST_INC &&
(ssa_var_info[ssa_ops[i].op1_use].range.overflow ||
ssa_var_info[ssa_ops[i].op1_use].range.max == ZEND_LONG_MAX))) {
/* may overflow */