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

Merge branch 'PHP-8.4'

Browse Source 
* PHP-8.4:
  Fix infinite recursion on deprecated attribute evaluation
This commit is contained in:
Ilija Tovilo
2025-03-26 23:40:58 +01:00
parent ab6e464ae2 272f7f75e2
commit 99f72fa499
8 changed files with 73 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Zend/tests/attributes/deprecated/class_constants/gh17711.phpt Normal file
View File

@@ -0,0 +1,28 @@
--TEST--
GH-17711: Infinite recursion through deprecated class constants self-referencing through deprecation message
--FILE--
<?php
class C {
#[\Deprecated(self::C)]
const C = TEST;
}
const TEST = 'Message';
var_dump(C::C);
class D {
#[\Deprecated(Alias::C)]
const C = 'test';
}
class_alias('D', 'Alias');
var_dump(D::C);
?>
--EXPECTF--
Deprecated: Constant C::C is deprecated, Message in %s on line %d
string(7) "Message"
Deprecated: Constant D::C is deprecated, test in %s on line %d
string(4) "test"

2
Zend/zend_API.c
View File

@@ -1439,7 +1439,7 @@ ZEND_API HashTable *zend_separate_class_constants_table(zend_class_entry *class_
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(&class_type->constants_table, key, c) {
if (c->ce == class_type) {
if (Z_TYPE(c->value) == IS_CONSTANT_AST) {
if (Z_TYPE(c->value) == IS_CONSTANT_AST || (ZEND_CLASS_CONST_FLAGS(c) & ZEND_ACC_DEPRECATED)) {
new_c = zend_arena_alloc(&CG(arena), sizeof(zend_class_constant));
memcpy(new_c, c, sizeof(zend_class_constant));
c = new_c;

4
Zend/zend_compile.c
View File

@@ -8862,6 +8862,10 @@ static void zend_compile_class_const_decl(zend_ast *ast, uint32_t flags, zend_as
if (deprecated) {
ZEND_CLASS_CONST_FLAGS(c) |= ZEND_ACC_DEPRECATED;
/* For deprecated constants, we need to flag the zval for recursion
* detection. Make sure the zval is separated out of shm. */
ce->ce_flags |= ZEND_ACC_HAS_AST_CONSTANTS;
ce->ce_flags &= ~ZEND_ACC_CONSTANTS_UPDATED;
}
}
}

4
Zend/zend_constants.c
View File

@@ -362,8 +362,10 @@ ZEND_API zval *zend_get_class_constant_ex(zend_string *class_name, zend_string *
}
if (UNEXPECTED(ZEND_CLASS_CONST_FLAGS(c) & ZEND_ACC_DEPRECATED)) {
if ((flags & ZEND_FETCH_CLASS_SILENT) == 0) {
if ((flags & ZEND_FETCH_CLASS_SILENT) == 0 && !CONST_IS_RECURSIVE(c)) {
CONST_PROTECT_RECURSION(c);
zend_deprecated_class_constant(c, constant_name);
CONST_UNPROTECT_RECURSION(c);
if (EG(exception)) {
goto failure;
}

11
Zend/zend_constants.h
View File

@@ -27,6 +27,17 @@
#define CONST_NO_FILE_CACHE (1<<1) /* Can't be saved in file cache */
#define CONST_DEPRECATED (1<<2) /* Deprecated */
#define CONST_OWNED (1<<3) /* constant should be destroyed together with class */
#define CONST_RECURSIVE (1<<4) /* Recursion protection for constant evaluation */
#define CONST_IS_RECURSIVE(c) (Z_CONSTANT_FLAGS((c)->value) & CONST_RECURSIVE)
#define CONST_PROTECT_RECURSION(c) \
do { \
Z_CONSTANT_FLAGS((c)->value) |= CONST_RECURSIVE; \
} while (0)
#define CONST_UNPROTECT_RECURSION(c) \
do { \
Z_CONSTANT_FLAGS((c)->value) &= ~CONST_RECURSIVE; \
} while (0)
#define PHP_USER_CONSTANT 0x7fffff /* a constant defined in user space */

4
Zend/zend_vm_def.h
View File

@@ -6103,8 +6103,10 @@ ZEND_VM_HANDLER(181, ZEND_FETCH_CLASS_CONSTANT, VAR|CONST|UNUSED|CLASS_FETCH, CO
}
bool is_constant_deprecated = ZEND_CLASS_CONST_FLAGS(c) & ZEND_ACC_DEPRECATED;
if (UNEXPECTED(is_constant_deprecated)) {
if (UNEXPECTED(is_constant_deprecated) && !CONST_IS_RECURSIVE(c)) {
CONST_PROTECT_RECURSION(c);
zend_deprecated_class_constant(c, constant_name);
CONST_UNPROTECT_RECURSION(c);
if (EG(exception)) {
ZVAL_UNDEF(EX_VAR(opline->result.var));

24
Zend/zend_vm_execute.h generated
View File

@@ -7626,8 +7626,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_CONSTANT_SPEC_CONS
}
bool is_constant_deprecated = ZEND_CLASS_CONST_FLAGS(c) & ZEND_ACC_DEPRECATED;
if (UNEXPECTED(is_constant_deprecated)) {
if (UNEXPECTED(is_constant_deprecated) && !CONST_IS_RECURSIVE(c)) {
CONST_PROTECT_RECURSION(c);
zend_deprecated_class_constant(c, constant_name);
CONST_UNPROTECT_RECURSION(c);
if (EG(exception)) {
ZVAL_UNDEF(EX_VAR(opline->result.var));
@@ -8786,8 +8788,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_CONSTANT_SPEC_CONS
}
bool is_constant_deprecated = ZEND_CLASS_CONST_FLAGS(c) & ZEND_ACC_DEPRECATED;
if (UNEXPECTED(is_constant_deprecated)) {
if (UNEXPECTED(is_constant_deprecated) && !CONST_IS_RECURSIVE(c)) {
CONST_PROTECT_RECURSION(c);
zend_deprecated_class_constant(c, constant_name);
CONST_UNPROTECT_RECURSION(c);
if (EG(exception)) {
ZVAL_UNDEF(EX_VAR(opline->result.var));
@@ -25885,8 +25889,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_CONSTANT_SPEC_VAR_
}
bool is_constant_deprecated = ZEND_CLASS_CONST_FLAGS(c) & ZEND_ACC_DEPRECATED;
if (UNEXPECTED(is_constant_deprecated)) {
if (UNEXPECTED(is_constant_deprecated) && !CONST_IS_RECURSIVE(c)) {
CONST_PROTECT_RECURSION(c);
zend_deprecated_class_constant(c, constant_name);
CONST_UNPROTECT_RECURSION(c);
if (EG(exception)) {
ZVAL_UNDEF(EX_VAR(opline->result.var));
@@ -26454,8 +26460,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_CONSTANT_SPEC_VAR_
}
bool is_constant_deprecated = ZEND_CLASS_CONST_FLAGS(c) & ZEND_ACC_DEPRECATED;
if (UNEXPECTED(is_constant_deprecated)) {
if (UNEXPECTED(is_constant_deprecated) && !CONST_IS_RECURSIVE(c)) {
CONST_PROTECT_RECURSION(c);
zend_deprecated_class_constant(c, constant_name);
CONST_UNPROTECT_RECURSION(c);
if (EG(exception)) {
ZVAL_UNDEF(EX_VAR(opline->result.var));
@@ -35293,8 +35301,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_CONSTANT_SPEC_UNUS
}
bool is_constant_deprecated = ZEND_CLASS_CONST_FLAGS(c) & ZEND_ACC_DEPRECATED;
if (UNEXPECTED(is_constant_deprecated)) {
if (UNEXPECTED(is_constant_deprecated) && !CONST_IS_RECURSIVE(c)) {
CONST_PROTECT_RECURSION(c);
zend_deprecated_class_constant(c, constant_name);
CONST_UNPROTECT_RECURSION(c);
if (EG(exception)) {
ZVAL_UNDEF(EX_VAR(opline->result.var));
@@ -35652,8 +35662,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_CONSTANT_SPEC_UNUS
}
bool is_constant_deprecated = ZEND_CLASS_CONST_FLAGS(c) & ZEND_ACC_DEPRECATED;
if (UNEXPECTED(is_constant_deprecated)) {
if (UNEXPECTED(is_constant_deprecated) && !CONST_IS_RECURSIVE(c)) {
CONST_PROTECT_RECURSION(c);
zend_deprecated_class_constant(c, constant_name);
CONST_UNPROTECT_RECURSION(c);
if (EG(exception)) {
ZVAL_UNDEF(EX_VAR(opline->result.var));

5
ext/opcache/ZendAccelerator.c
View File

@@ -3864,6 +3864,11 @@ static bool preload_try_resolve_constants(zend_class_entry *ce)
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(&ce->constants_table, key, c) {
val = &c->value;
if (Z_TYPE_P(val) == IS_CONSTANT_AST) {
/* For deprecated constants, we need to flag the zval for recursion
* detection. Make sure the zval is separated out of shm. */
if (ZEND_CLASS_CONST_FLAGS(c) & ZEND_ACC_DEPRECATED) {
ok = false;
}
if (EXPECTED(zend_update_class_constant(c, key, c->ce) == SUCCESS)) {
was_changed = changed = true;
} else {