fix(opcache, reflection): plug two memory leaks in generics persistence and reflection cleanup

Signed-off-by: azjezz <azjezz@protonmail.com>

Author: azjezz

ext/opcache/zend_persist.c

@@ -438,14 +438,27 @@ static zend_generic_parameter_list *zend_persist_generic_parameter_list(zend_gen
 
 static HashTable *zend_persist_generic_type_table_ht(HashTable *ht)
 {
-	zval *v;
 	zend_hash_persist(ht);
-	ZEND_HASH_FOREACH_VAL(ht, v) {
-		zend_type *boxed = Z_PTR_P(v);
-		zend_type *copy = zend_shared_memdup_put_free(boxed, sizeof(zend_type));
-		zend_persist_type(copy);
-		ZVAL_PTR(v, copy);
-	} ZEND_HASH_FOREACH_END();
+	if (HT_IS_PACKED(ht)) {
+		zval *v;
+		ZEND_HASH_PACKED_FOREACH_VAL(ht, v) {
+			zend_type *boxed = Z_PTR_P(v);
+			zend_type *copy = zend_shared_memdup_put_free(boxed, sizeof(zend_type));
+			zend_persist_type(copy);
+			Z_PTR_P(v) = copy;
+		} ZEND_HASH_FOREACH_END();
+	} else {
+		Bucket *p;
+		ZEND_HASH_MAP_FOREACH_BUCKET(ht, p) {
+			if (p->key) {
+				zend_accel_store_interned_string(p->key);
+			}
+			zend_type *boxed = Z_PTR(p->val);
+			zend_type *copy = zend_shared_memdup_put_free(boxed, sizeof(zend_type));
+			zend_persist_type(copy);
+			Z_PTR(p->val) = copy;
+		} ZEND_HASH_FOREACH_END();
+	}
 	HashTable *ptr = zend_shared_memdup_put_free(ht, sizeof(HashTable));
 	GC_SET_REFCOUNT(ptr, 2);
 	GC_TYPE_INFO(ptr) = GC_ARRAY | ((IS_ARRAY_IMMUTABLE|GC_NOT_COLLECTABLE) << GC_FLAGS_SHIFT);

ext/opcache/zend_persist_calc.c

@@ -257,12 +257,23 @@ static void zend_persist_generic_parameter_list_calc(zend_generic_parameter_list
 
 static void zend_persist_generic_type_table_ht_calc(HashTable *ht)
 {
-	zval *v;
 	zend_hash_persist_calc(ht);
-	ZEND_HASH_FOREACH_VAL(ht, v) {
-		ADD_SIZE(sizeof(zend_type));
-		zend_persist_type_calc((zend_type *) Z_PTR_P(v));
-	} ZEND_HASH_FOREACH_END();
+	if (HT_IS_PACKED(ht)) {
+		zval *v;
+		ZEND_HASH_PACKED_FOREACH_VAL(ht, v) {
+			ADD_SIZE(sizeof(zend_type));
+			zend_persist_type_calc((zend_type *) Z_PTR_P(v));
+		} ZEND_HASH_FOREACH_END();
+	} else {
+		Bucket *p;
+		ZEND_HASH_MAP_FOREACH_BUCKET(ht, p) {
+			if (p->key) {
+				ADD_INTERNED_STRING(p->key);
+			}
+			ADD_SIZE(sizeof(zend_type));
+			zend_persist_type_calc((zend_type *) Z_PTR(p->val));
+		} ZEND_HASH_FOREACH_END();
+	}
 	ADD_SIZE(sizeof(HashTable));
 }
 

ext/reflection/php_reflection.c

@@ -179,7 +179,8 @@ typedef enum {
 	REF_TYPE_TYPE,
 	REF_TYPE_PROPERTY,
 	REF_TYPE_CLASS_CONSTANT,
-	REF_TYPE_ATTRIBUTE
+	REF_TYPE_ATTRIBUTE,
+	REF_TYPE_GENERIC_PARAMETER
 } reflection_type_t;
 
 /* Struct for reflection objects */
@@ -281,6 +282,12 @@ static void reflection_free_objects_storage(zend_object *object) /* {{{ */
 			efree(intern->ptr);
 			break;
 		}
+		case REF_TYPE_GENERIC_PARAMETER: {
+			generic_parameter_reference *ref = intern->ptr;
+			zval_ptr_dtor(&ref->declaring);
+			efree(ref);
+			break;
+		}
 		case REF_TYPE_GENERATOR:
 		case REF_TYPE_FIBER:
 		case REF_TYPE_CLASS_CONSTANT:
@@ -8290,7 +8297,7 @@ static void reflection_generic_type_parameter_factory(
 	reference->index = index;
 	ZVAL_COPY(&reference->declaring, declaring);
 	intern->ptr = reference;
-	intern->ref_type = REF_TYPE_OTHER;
+	intern->ref_type = REF_TYPE_GENERIC_PARAMETER;
 
 	ZVAL_STR_COPY(reflection_prop_name(object), param->name);
 }