php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix GH-17234: Numeric parent hook call fails with assertion

Browse Source 
The current code expects the property name to be a string, but it can
also be a number via the {} syntax. Handle this consistently to a string
by using zval_get_string which will do the type coercion and refcount
update (instead of assuming string and doing an explicit string copy).

Closes GH-17236.
This commit is contained in:
Niels Dossche
2024-12-21 19:50:27 +01:00
parent 2860c3d641
commit 71493623f4
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -2,6 +2,10 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 8.4.4
- Core:
. Fixed bug GH-17234 (Numeric parent hook call fails with assertion).
(nielsdos)
- FTP:
. Fixed bug GH-16800 (ftp functions can abort with EINTR). (nielsdos)

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

@@ -5098,7 +5098,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_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_property_hook_kind hook_kind = zend_get_property_hook_kind_from_name(hook_name);
ZEND_ASSERT(hook_kind != (uint32_t)-1);
@@ -5122,7 +5123,6 @@ static bool zend_compile_parent_property_hook_call(znode *result, zend_ast *ast,
zend_op *opline = get_next_op();
opline->opcode = ZEND_INIT_PARENT_PROPERTY_HOOK_CALL;
opline->op1_type = IS_CONST;
zend_string_copy(property_name);
opline->op1.constant = zend_add_literal_string(&property_name);
opline->op2.num = hook_kind;