adds zend_type_release_internal()

Author: ju1ius

Zend/zend_API.c

@@ -3496,7 +3496,7 @@ ZEND_API zend_result zend_disable_class(const char *class_name, size_t class_nam
 	ZEND_HASH_MAP_FOREACH_PTR(&disabled_class->properties_info, prop) {
 		if (prop->ce == disabled_class) {
 			zend_string_release(prop->name);
-			zend_type_release(prop->type, /* persistent */ 1);
+			zend_type_release_internal(prop->type);
 			free(prop);
 		}
 	} ZEND_HASH_FOREACH_END();

Zend/zend_compile.h

@@ -862,7 +862,14 @@ ZEND_API void zend_destroy_static_vars(zend_op_array *op_array);
 ZEND_API void zend_destroy_file_handle(zend_file_handle *file_handle);
 ZEND_API void zend_cleanup_mutable_class_data(zend_class_entry *ce);
 ZEND_API void zend_cleanup_internal_class_data(zend_class_entry *ce);
+/**
+ * Used to release userland types.
+ */
 ZEND_API void zend_type_release(zend_type type, bool persistent);
+/**
+ * Used to release types associated with internal functions or classes.
+ */
+ZEND_API void zend_type_release_internal(zend_type type);
 ZEND_API zend_string *zend_create_member_string(zend_string *class_name, zend_string *member_name);
 
 

Zend/zend_opcode.c

@@ -118,9 +118,6 @@ ZEND_API void zend_type_release(zend_type type, bool persistent) {
 						zend_string_release(ZEND_TYPE_NAME(*sublist_type));
 					}
 				} ZEND_TYPE_LIST_FOREACH_END();
-				if (!ZEND_TYPE_USES_ARENA(*list_type) && persistent) {
-					free(ZEND_TYPE_LIST(*list_type));
-				}
 			} else if (ZEND_TYPE_HAS_NAME(*list_type)) {
 				zend_string_release(ZEND_TYPE_NAME(*list_type));
 			}
@@ -133,6 +130,28 @@ ZEND_API void zend_type_release(zend_type type, bool persistent) {
 	}
 }
 
+ZEND_API void zend_type_release_internal(zend_type type) {
+	ZEND_ASSERT(!ZEND_TYPE_USES_ARENA(type));
+	if (ZEND_TYPE_HAS_LIST(type)) {
+		zend_type *list_type, *sublist_type;
+		ZEND_TYPE_LIST_FOREACH(ZEND_TYPE_LIST(type), list_type) {
+			if (ZEND_TYPE_HAS_LIST(*list_type)) {
+				ZEND_TYPE_LIST_FOREACH(ZEND_TYPE_LIST(*list_type), sublist_type) {
+					if (ZEND_TYPE_HAS_NAME(*sublist_type)) {
+						zend_string_release(ZEND_TYPE_NAME(*sublist_type));
+					}
+				} ZEND_TYPE_LIST_FOREACH_END();
+				free(ZEND_TYPE_LIST(*list_type));
+			} else if (ZEND_TYPE_HAS_NAME(*list_type)) {
+				zend_string_release(ZEND_TYPE_NAME(*list_type));
+			}
+		} ZEND_TYPE_LIST_FOREACH_END();
+		free(ZEND_TYPE_LIST(type));
+	} else if (ZEND_TYPE_HAS_NAME(type)) {
+		zend_string_release(ZEND_TYPE_NAME(type));
+	}
+}
+
 void zend_free_internal_arg_info(zend_internal_function *function) {
 	if ((function->fn_flags & (ZEND_ACC_HAS_RETURN_TYPE|ZEND_ACC_HAS_TYPE_HINTS)) &&
 		function->arg_info) {
@@ -145,7 +164,7 @@ void zend_free_internal_arg_info(zend_internal_function *function) {
 			num_args++;
 		}
 		for (i = 0 ; i < num_args; i++) {
-			zend_type_release(arg_info[i].type, /* persistent */ 1);
+			zend_type_release_internal(arg_info[i].type);
 		}
 		free(arg_info);
 	}
@@ -457,7 +476,7 @@ ZEND_API void destroy_zend_class(zval *zv)
 			ZEND_HASH_MAP_FOREACH_PTR(&ce->properties_info, prop_info) {
 				if (prop_info->ce == ce) {
 					zend_string_release(prop_info->name);
-					zend_type_release(prop_info->type, /* persistent */ 1);
+					zend_type_release_internal(prop_info->type);
 					free(prop_info);
 				}
 			} ZEND_HASH_FOREACH_END();
@@ -492,6 +511,7 @@ ZEND_API void destroy_zend_class(zval *zv)
 						} else {
 							zval_internal_ptr_dtor(&c->value);
 						}
+						zend_type_release_internal(c->type);
 						if (c->doc_comment) {
 							zend_string_release_ex(c->doc_comment, 1);
 						}