Also destroy classes in reverse order with ZTS

nikic · nikic · commit feab47988435 · 2021-04-30T09:58:29.000+02:00
diff --git a/Zend/zend.c b/Zend/zend.c
@@ -730,7 +730,8 @@ static void compiler_globals_dtor(zend_compiler_globals *compiler_globals) /* {{
 		free(compiler_globals->function_table);
 	}
 	if (compiler_globals->class_table != GLOBAL_CLASS_TABLE) {
-		zend_hash_destroy(compiler_globals->class_table);
+		/* Child classes may reuse structures from parent classes, so destroy in reverse order. */
+		zend_hash_graceful_reverse_destroy(compiler_globals->class_table);
 		free(compiler_globals->class_table);
 	}
 	if (compiler_globals->auto_globals != GLOBAL_AUTO_GLOBALS_TABLE) {

Original file line number	Diff line number	Diff line change
`@@ -730,7 +730,8 @@ static void compiler_globals_dtor(zend_compiler_globals compiler_globals) / {{`
`730`	`730`	`free(compiler_globals->function_table);`
`731`	`731`	`}`
`732`	`732`	`if (compiler_globals->class_table != GLOBAL_CLASS_TABLE) {`
`733`		`- zend_hash_destroy(compiler_globals->class_table);`
	`733`	`+ /* Child classes may reuse structures from parent classes, so destroy in reverse order. */`
	`734`	`+ zend_hash_graceful_reverse_destroy(compiler_globals->class_table);`
`734`	`735`	`free(compiler_globals->class_table);`
`735`	`736`	`}`
`736`	`737`	`if (compiler_globals->auto_globals != GLOBAL_AUTO_GLOBALS_TABLE) {`