fixup! Implement the "Redacting parameters in back traces" RFC

Author: TimWolla

Zend/zend_builtin_functions.c

@@ -1572,7 +1572,6 @@ static void debug_backtrace_get_args(zend_execute_data *call, zval *arg_array) /
 
 						if (old_arg) {
 							ZVAL_DEREF(old_arg);
-							Z_TRY_ADDREF_P(old_arg);
 							ZVAL_COPY_VALUE(&arg, old_arg);
 						} else {
 							ZVAL_NULL(&arg);
@@ -1584,6 +1583,7 @@ static void debug_backtrace_get_args(zend_execute_data *call, zval *arg_array) /
 							zend_call_method_with_1_params(Z_OBJ_P(&new_arg), zend_ce_sensitive_parameter_value, &zend_ce_sensitive_parameter_value->constructor, "__construct", NULL, &arg);
 							ZEND_HASH_FILL_SET(&new_arg);
 						} else {
+							Z_TRY_ADDREF_P(&arg);
 							ZEND_HASH_FILL_SET(&arg);
 						}
 
@@ -1606,7 +1606,6 @@ static void debug_backtrace_get_args(zend_execute_data *call, zval *arg_array) /
 						if (EXPECTED(Z_TYPE_INFO_P(p) != IS_UNDEF)) {
 							zval *old_arg = p;
 							ZVAL_DEREF(old_arg);
-							Z_TRY_ADDREF_P(old_arg);
 							ZVAL_COPY_VALUE(&arg, old_arg);
 						} else {
 							ZVAL_NULL(&arg);
@@ -1618,6 +1617,7 @@ static void debug_backtrace_get_args(zend_execute_data *call, zval *arg_array) /
 							zend_call_method_with_1_params(Z_OBJ_P(&new_arg), zend_ce_sensitive_parameter_value, &zend_ce_sensitive_parameter_value->constructor, "__construct", NULL, &arg);
 							ZEND_HASH_FILL_SET(&new_arg);
 						} else {
+							Z_TRY_ADDREF_P(&arg);
 							ZEND_HASH_FILL_SET(&arg);
 						}
 
@@ -1646,7 +1646,6 @@ static void debug_backtrace_get_args(zend_execute_data *call, zval *arg_array) /
 				if (EXPECTED(Z_TYPE_INFO_P(p) != IS_UNDEF)) {
 					zval *old_arg = p;
 					ZVAL_DEREF(old_arg);
-					Z_TRY_ADDREF_P(old_arg);
 					ZVAL_COPY_VALUE(&arg, old_arg);
 				} else {
 					ZVAL_NULL(&arg);
@@ -1658,6 +1657,7 @@ static void debug_backtrace_get_args(zend_execute_data *call, zval *arg_array) /
 					zend_call_method_with_1_params(Z_OBJ_P(&new_arg), zend_ce_sensitive_parameter_value, &zend_ce_sensitive_parameter_value->constructor, "__construct", NULL, &arg);
 					ZEND_HASH_FILL_SET(&new_arg);
 				} else {
+					Z_TRY_ADDREF_P(&arg);
 					ZEND_HASH_FILL_SET(&arg);
 				}