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

Author: TimWolla

Zend/zend_attributes.c

@@ -30,10 +30,6 @@ ZEND_API zend_class_entry *zend_ce_allow_dynamic_properties;
 ZEND_API zend_class_entry *zend_ce_sensitive_parameter;
 ZEND_API zend_class_entry *zend_ce_sensitive_parameter_value;
 
-typedef struct {
-	zend_object std;
-} attributes_sensitive_parameter_value;
-
 static zend_object_handlers attributes_object_handlers_sensitive_parameter_value;
 
 static HashTable internal_attributes;
@@ -134,25 +130,14 @@ ZEND_METHOD(SensitiveParameterValue, __debugInfo)
 
 static zend_object *attributes_sensitive_parameter_value_new(zend_class_entry *ce)
 {
-	attributes_sensitive_parameter_value *intern = zend_object_alloc(sizeof(attributes_sensitive_parameter_value), ce);
-	memset(intern, 0, sizeof(attributes_sensitive_parameter_value) - sizeof(zend_object));
-
-	zend_object_std_init(&intern->std, ce);
-	object_properties_init(&intern->std, ce);
-	intern->std.handlers = &attributes_object_handlers_sensitive_parameter_value;
-
-	return &intern->std;
-}
+	zend_object *object;
 
-static inline attributes_sensitive_parameter_value *attributes_sensitive_parameter_value_from_obj(zend_object *obj) {
-	return (attributes_sensitive_parameter_value *)((char *)(obj) - XtOffsetOf(attributes_sensitive_parameter_value, std));
-}
+	object = zend_objects_new(ce);
+	object->handlers = &attributes_object_handlers_sensitive_parameter_value;
 
-static void attributes_sensitive_parameter_value_free_obj(zend_object *object)
-{
-	attributes_sensitive_parameter_value *v = attributes_sensitive_parameter_value_from_obj(object);
+	object_properties_init(object, ce);
 
-	zend_object_std_dtor(&v->std);
+	return object;
 }
 
 static HashTable *attributes_sensitive_parameter_value_get_properties_for(zend_object *zobj, zend_prop_purpose purpose)
@@ -388,13 +373,12 @@ void zend_register_attribute_ce(void)
 	zend_ce_sensitive_parameter = register_class_SensitiveParameter();
 	attr = zend_internal_attribute_register(zend_ce_sensitive_parameter, ZEND_ATTRIBUTE_TARGET_PARAMETER);
 
-	/* This is not an attribute, thus the register call is missing. */
-	zend_ce_sensitive_parameter_value = register_class_SensitiveParameterValue();
-	zend_ce_sensitive_parameter_value->create_object = attributes_sensitive_parameter_value_new;
 	memcpy(&attributes_object_handlers_sensitive_parameter_value, &std_object_handlers, sizeof(zend_object_handlers));
-	attributes_object_handlers_sensitive_parameter_value.offset = XtOffsetOf(attributes_sensitive_parameter_value, std);
-	attributes_object_handlers_sensitive_parameter_value.free_obj = attributes_sensitive_parameter_value_free_obj;
 	attributes_object_handlers_sensitive_parameter_value.get_properties_for = attributes_sensitive_parameter_value_get_properties_for;
+
+	/* This is not an actual attribute, thus the zend_internal_attribute_register() call is missing. */
+	zend_ce_sensitive_parameter_value = register_class_SensitiveParameterValue();
+	zend_ce_sensitive_parameter_value->create_object = attributes_sensitive_parameter_value_new;
 }
 
 void zend_attributes_shutdown(void)