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

Zend: Use object_init_with_constructor() for SensitiveParameterValue

Browse Source
This commit is contained in:
Niels Dossche
2025-11-11 01:18:22 +01:00
parent c95a944c1b
commit f15c7121fb
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Zend/zend_builtin_functions.c
View File

@@ -1761,8 +1761,7 @@ static void debug_backtrace_get_args(zend_execute_data *call, zval *arg_array) /
if (is_sensitive) { if (is_sensitive) {
zval redacted_arg; zval redacted_arg;
object_init_ex(&redacted_arg, zend_ce_sensitive_parameter_value); object_init_with_constructor(&redacted_arg, zend_ce_sensitive_parameter_value, 1, &original_arg, NULL);
zend_call_known_function(Z_OBJCE_P(&redacted_arg)->constructor, Z_OBJ_P(&redacted_arg), Z_OBJCE_P(&redacted_arg), NULL, 1, &original_arg, NULL);
ZEND_HASH_FILL_SET(&redacted_arg); ZEND_HASH_FILL_SET(&redacted_arg);
} else { } else {
Z_TRY_ADDREF_P(&original_arg); Z_TRY_ADDREF_P(&original_arg);
@@ -1787,8 +1786,7 @@ static void debug_backtrace_get_args(zend_execute_data *call, zval *arg_array) /
if (is_sensitive) { if (is_sensitive) {
zval redacted_arg; zval redacted_arg;
object_init_ex(&redacted_arg, zend_ce_sensitive_parameter_value); object_init_with_constructor(&redacted_arg, zend_ce_sensitive_parameter_value, 1, &original_arg, NULL);
zend_call_known_function(Z_OBJCE_P(&redacted_arg)->constructor, Z_OBJ_P(&redacted_arg), Z_OBJCE_P(&redacted_arg), NULL, 1, &original_arg, NULL);
ZEND_HASH_FILL_SET(&redacted_arg); ZEND_HASH_FILL_SET(&redacted_arg);
} else { } else {
Z_TRY_ADDREF_P(&original_arg); Z_TRY_ADDREF_P(&original_arg);
@@ -1821,8 +1819,7 @@ static void debug_backtrace_get_args(zend_execute_data *call, zval *arg_array) /
if (is_sensitive) { if (is_sensitive) {
zval redacted_arg; zval redacted_arg;
object_init_ex(&redacted_arg, zend_ce_sensitive_parameter_value); object_init_with_constructor(&redacted_arg, zend_ce_sensitive_parameter_value, 1, &original_arg, NULL);
zend_call_known_function(Z_OBJCE_P(&redacted_arg)->constructor, Z_OBJ_P(&redacted_arg), Z_OBJCE_P(&redacted_arg), NULL, 1, &original_arg, NULL);
ZEND_HASH_FILL_SET(&redacted_arg); ZEND_HASH_FILL_SET(&redacted_arg);
} else { } else {
Z_TRY_ADDREF_P(&original_arg); Z_TRY_ADDREF_P(&original_arg);
@@ -1852,8 +1849,7 @@ static void debug_backtrace_get_args(zend_execute_data *call, zval *arg_array) /
ZVAL_DEREF(arg); ZVAL_DEREF(arg);
if (is_sensitive) { if (is_sensitive) {
zval redacted_arg; zval redacted_arg;
object_init_ex(&redacted_arg, zend_ce_sensitive_parameter_value); object_init_with_constructor(&redacted_arg, zend_ce_sensitive_parameter_value, 1, arg, NULL);
zend_call_method_with_1_params(Z_OBJ_P(&redacted_arg), zend_ce_sensitive_parameter_value, &zend_ce_sensitive_parameter_value->constructor, "__construct", NULL, arg);
zend_hash_add_new(Z_ARRVAL_P(arg_array), name, &redacted_arg); zend_hash_add_new(Z_ARRVAL_P(arg_array), name, &redacted_arg);
} else { } else {
Z_TRY_ADDREF_P(arg); Z_TRY_ADDREF_P(arg);