This commit is contained in:
Nikita Popov 2020-01-30 14:55:58 +01:00
parent be7eab3202
commit f70b552326
3 changed files with 27 additions and 0 deletions

2
NEWS
View File

@ -39,6 +39,8 @@ PHP NEWS
. Fixed bug #79114 (Eval class during preload causes class to be only half
available). (Laruence)
. Fixed bug #79128 (Preloading segfaults if preload_user is used). (Nikita)
. Fixed bug #79193 (Incorrect type inference for self::$field =& $field).
(Nikita)
- OpenSSL:
. Fixed bug #79145 (openssl memory leak). (cmb, Nikita)

View File

@ -2999,6 +2999,13 @@ static int zend_update_type_info(const zend_op_array *op_array,
UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def);
}
break;
case ZEND_ASSIGN_STATIC_PROP_REF:
if ((opline+1)->op1_type == IS_CV) {
opline++;
i++;
UPDATE_SSA_TYPE(MAY_BE_REF, ssa_ops[i].op1_def);
}
break;
case ZEND_BIND_GLOBAL:
tmp = MAY_BE_REF | MAY_BE_ANY
| MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF;

View File

@ -0,0 +1,18 @@
--TEST--
Bug #79193: Incorrect type inference for self::$field =& $field
--FILE--
<?php
class Test {
public static $foo;
public static function method($bar) {
Test::$foo =& $bar;
var_dump(is_int($bar));
}
}
Test::method(1);
?>
--EXPECT--
bool(true)