Fix extension object handlers to satisfy new requirements

Author: Girgias

Zend/zend_attributes.c

@@ -138,7 +138,7 @@ ZEND_METHOD(SensitiveParameterValue, __debugInfo)
 
 static HashTable *attributes_sensitive_parameter_value_get_properties_for(zend_object *zobj, zend_prop_purpose purpose)
 {
-	return NULL;
+	return (HashTable*)&zend_empty_array;
 }
 
 ZEND_METHOD(Override, __construct)

Zend/zend_object_handlers.h

@@ -82,9 +82,15 @@ typedef void (*zend_object_unset_property_t)(zend_object *object, zend_string *m
 /* Used to remove a dimension of the object */
 typedef void (*zend_object_unset_dimension_t)(zend_object *object, zval *offset);
 
-/* Used to get hash of the properties of the object, as hash of zval's */
+/* Used to get hash of the properties of the object, as hash of zval's
+ * Must only return NULL when an exception occurs, if no properties
+ * return (HashTable*)&zend_empty_array;
+ */
 typedef HashTable *(*zend_object_get_properties_t)(zend_object *object);
 
+/* Must only return NULL when an exception occurs, if no properties
+ * return (HashTable*)&zend_empty_array;
+ */
 typedef HashTable *(*zend_object_get_debug_info_t)(zend_object *object, int *is_temp);
 
 typedef enum _zend_prop_purpose {

ext/ffi/ffi.c

@@ -2047,7 +2047,8 @@ static HashTable *zend_ffi_cdata_get_debug_info(zend_object *obj, int *is_temp)
 
 	switch (type->kind) {
 		case ZEND_FFI_TYPE_VOID:
-			return NULL;
+			*is_temp = false;
+			return (HashTable*)&zend_empty_array;
 		case ZEND_FFI_TYPE_BOOL:
 		case ZEND_FFI_TYPE_CHAR:
 		case ZEND_FFI_TYPE_ENUM:
@@ -2274,7 +2275,8 @@ static int zend_ffi_ctype_compare_objects(zval *o1, zval *o2) /* {{{ */
 
 static HashTable *zend_ffi_ctype_get_debug_info(zend_object *obj, int *is_temp) /* {{{ */
 {
-	return NULL;
+	*is_temp = false;
+	return (HashTable*)&zend_empty_array;
 }
 /* }}} */
 

ext/ffi/tests/035.phpt

@@ -23,6 +23,4 @@ object(FFI\CData:uint16_t[2])#%d (2) {
   [1]=>
   int(0)
 }
-object(FFI\CData:uint16_t[2])#%d (0) {
-}
 FFI\Exception: Use after free()

ext/spl/spl_fixedarray.c

@@ -238,7 +238,7 @@ static HashTable* spl_fixedarray_object_get_properties_for(zend_object *obj, zen
 
 	const zend_long size = intern->array.size;
 	if (size == 0 && (!source_properties || !zend_hash_num_elements(source_properties))) {
-		return NULL;
+		return (HashTable*)&zend_empty_array;
 	}
 	zval *const elements = intern->array.elements;
 	HashTable *ht = zend_new_array(size);