Merge pull request #998 from Unity-Technologies/unity-master-fix-domain-list

joncham · web-flow · commit 16681b946c3d · 2018-07-25T16:08:35.000-04:00
Fix copy/paste error. Use size parameter for non-moving GC allocation…

case 1062676: Fix crash on exit when domains are created
diff --git a/mono/metadata/domain.c b/mono/metadata/domain.c
@@ -299,16 +299,16 @@ gc_alloc_fixed_non_heap_list (size_t size)
 	if (mono_gc_is_moving ())
 		return g_malloc0 (size);
 	else
-		return mono_gc_alloc_fixed (appdomain_list_size * sizeof (void*), MONO_GC_DESCRIPTOR_NULL, MONO_ROOT_SOURCE_DOMAIN, NULL, "Domain List");
+		return mono_gc_alloc_fixed (size, MONO_GC_DESCRIPTOR_NULL, MONO_ROOT_SOURCE_DOMAIN, NULL, "Domain List");
 }
 
 static void
 gc_free_fixed_non_heap_list (void *ptr)
 {
 	if (mono_gc_is_moving ())
-		return g_free (ptr);
+		g_free (ptr);
 	else
-		return mono_gc_free_fixed (ptr);
+		mono_gc_free_fixed (ptr);
 }
 /*
  * Allocate an id for domain and set domain->domain_id.

Original file line number	Diff line number	Diff line change
`@@ -299,16 +299,16 @@ gc_alloc_fixed_non_heap_list (size_t size)`
`299`	`299`	`if (mono_gc_is_moving ())`
`300`	`300`	`return g_malloc0 (size);`
`301`	`301`	`else`
`302`		`- return mono_gc_alloc_fixed (appdomain_list_size * sizeof (void*), MONO_GC_DESCRIPTOR_NULL, MONO_ROOT_SOURCE_DOMAIN, NULL, "Domain List");`
	`302`	`+ return mono_gc_alloc_fixed (size, MONO_GC_DESCRIPTOR_NULL, MONO_ROOT_SOURCE_DOMAIN, NULL, "Domain List");`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`static void`
`306`	`306`	`gc_free_fixed_non_heap_list (void *ptr)`
`307`	`307`	`{`
`308`	`308`	`if (mono_gc_is_moving ())`
`309`		`- return g_free (ptr);`
	`309`	`+ g_free (ptr);`
`310`	`310`	`else`
`311`		`- return mono_gc_free_fixed (ptr);`
	`311`	`+ mono_gc_free_fixed (ptr);`
`312`	`312`	`}`
`313`	`313`	`/*`
`314`	`314`	`* Allocate an id for domain and set domain->domain_id.`