mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +02:00
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Fix GH-10570: Assertion `(key)->h != 0 && "Hash must be known"' failed.
This commit is contained in:
commit
9b10b65e2b
3 changed files with 17 additions and 0 deletions
2
NEWS
2
NEWS
|
@ -15,6 +15,8 @@ PHP NEWS
|
|||
. Fixed language scanner generation build. (Daniel Black)
|
||||
. Fixed zend_update_static_property() calling zend_update_static_property_ex()
|
||||
misleadingly with the wrong return type. (nielsdos)
|
||||
. Fixed unknown string hash on property fetch with integer constant name.
|
||||
(nielsdos)
|
||||
|
||||
- Curl:
|
||||
. Fixed deprecation warning at compile time. (Max Kellermann)
|
||||
|
|
14
Zend/tests/gh10570.phpt
Normal file
14
Zend/tests/gh10570.phpt
Normal file
|
@ -0,0 +1,14 @@
|
|||
--TEST--
|
||||
GH-10570 (Assertion `(key)->h != 0 && "Hash must be known"' failed.): constant variation
|
||||
--FILE--
|
||||
<?php
|
||||
$a = new stdClass();
|
||||
for ($i = 0; $i < 2; $i++) {
|
||||
$a->{90};
|
||||
$a->{0} = 0;
|
||||
}
|
||||
?>
|
||||
--EXPECTF--
|
||||
Warning: Undefined property: stdClass::$90 in %s on line %d
|
||||
|
||||
Warning: Undefined property: stdClass::$90 in %s on line %d
|
|
@ -2931,6 +2931,7 @@ static zend_op *zend_delayed_compile_prop(znode *result, zend_ast *ast, uint32_t
|
|||
opline = zend_delayed_emit_op(result, ZEND_FETCH_OBJ_R, &obj_node, &prop_node);
|
||||
if (opline->op2_type == IS_CONST) {
|
||||
convert_to_string(CT_CONSTANT(opline->op2));
|
||||
zend_string_hash_val(Z_STR_P(CT_CONSTANT(opline->op2)));
|
||||
opline->extended_value = zend_alloc_cache_slots(3);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue