forked from pool/mono-core
07f3e6aec5
checked in (request 34491) OBS-URL: https://build.opensuse.org/request/show/34491 OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=40
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
--- mono/metadata/domain.c
|
|
+++ mono/metadata/domain.c
|
|
@@ -1907,6 +1907,12 @@
|
|
domain->type_init_exception_hash = NULL;
|
|
}
|
|
|
|
+ /* must do this early as it accesses fields and types */
|
|
+ if (domain->special_static_fields) {
|
|
+ mono_alloc_special_static_data_free (domain->special_static_fields);
|
|
+ g_hash_table_destroy (domain->special_static_fields);
|
|
+ domain->special_static_fields = NULL;
|
|
+ }
|
|
for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
|
|
MonoAssembly *ass = tmp->data;
|
|
mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Unloading domain %s %p, assembly %s %p, refcount=%d\n", domain->friendly_name, domain, ass->aname.name, ass, ass->ref_count);
|
|
@@ -1929,12 +1935,6 @@
|
|
domain->null_reference_ex = NULL;
|
|
domain->stack_overflow_ex = NULL;
|
|
domain->entry_assembly = NULL;
|
|
- /* must do this early as it accesses fields and types */
|
|
- if (domain->special_static_fields) {
|
|
- mono_alloc_special_static_data_free (domain->special_static_fields);
|
|
- g_hash_table_destroy (domain->special_static_fields);
|
|
- domain->special_static_fields = NULL;
|
|
- }
|
|
|
|
g_free (domain->friendly_name);
|
|
domain->friendly_name = NULL;
|