archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.4'

Browse source 
* PHP-8.4:
  Fix GH-17234: Numeric parent hook call fails with assertion
This commit is contained in:
Niels Dossche 2025-01-07 19:21:35 +01:00
commit cc4402b6cb
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Zend/tests/property_hooks/gh17234.phpt Normal file
View file

@ -0,0 +1,15 @@
--TEST--
GH-17234 (Numeric parent hook call fails with assertion)
--FILE--
<?php
class ParentC {}
class Child extends ParentC {
public $a {
get {
return parent::${0}::get ();
}
}
}
?>
--EXPECTF--
Fatal error: Must not use parent::$0::get() in a different property ($a) in %s on line %d

4
Zend/zend_compile.c
View file

@ -5094,7 +5094,8 @@ static bool zend_compile_parent_property_hook_call(znode *result, zend_ast *ast,
zend_error_noreturn(E_COMPILE_ERROR, "Cannot create Closure for parent property hook call"); zend_error_noreturn(E_COMPILE_ERROR, "Cannot create Closure for parent property hook call");
} }
zend_string *property_name = zend_ast_get_str(class_ast->child[1]); zval *property_hook_name_zv = zend_ast_get_zval(class_ast->child[1]);
zend_string *property_name = zval_get_string(property_hook_name_zv);
zend_string *hook_name = zend_ast_get_str(method_ast); zend_string *hook_name = zend_ast_get_str(method_ast);
zend_property_hook_kind hook_kind = zend_get_property_hook_kind_from_name(hook_name); zend_property_hook_kind hook_kind = zend_get_property_hook_kind_from_name(hook_name);
ZEND_ASSERT(hook_kind != (uint32_t)-1); ZEND_ASSERT(hook_kind != (uint32_t)-1);
@ -5118,7 +5119,6 @@ static bool zend_compile_parent_property_hook_call(znode *result, zend_ast *ast,
zend_op *opline = get_next_op(); zend_op *opline = get_next_op();
opline->opcode = ZEND_INIT_PARENT_PROPERTY_HOOK_CALL; opline->opcode = ZEND_INIT_PARENT_PROPERTY_HOOK_CALL;
opline->op1_type = IS_CONST; opline->op1_type = IS_CONST;
zend_string_copy(property_name);
opline->op1.constant = zend_add_literal_string(&property_name); opline->op1.constant = zend_add_literal_string(&property_name);
opline->op2.num = hook_kind; opline->op2.num = hook_kind;