Merge pull request #824 from Unity-Technologies/unity-master-load-assembly-raw-decrease-refcount

joncham · web-flow · commit 31039ffb374f · 2018-01-25T16:39:19.000-05:00
Remove extra reference count on images loaded via byte array (case 923165)

case 923165 - Fix memory corruption/crash after domain reload when using Assembly.Load(Byte[])
diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c
@@ -2175,6 +2175,9 @@ ves_icall_System_AppDomain_LoadAssemblyRaw (MonoAppDomainHandle ad,
 		return refass; 
 	}
 
+	/* Clear the reference added by mono_image_open_from_data_full above */
+	mono_image_close (image);
+
 	refass = mono_assembly_get_object_handle (domain, ass, error);
 	if (!MONO_HANDLE_IS_NULL(refass))
 		MONO_HANDLE_SET (refass, evidence, evidence);

Original file line number	Diff line number	Diff line change
`@@ -2175,6 +2175,9 @@ ves_icall_System_AppDomain_LoadAssemblyRaw (MonoAppDomainHandle ad,`
`2175`	`2175`	`return refass;`
`2176`	`2176`	`}`
`2177`	`2177`
	`2178`	`+ /* Clear the reference added by mono_image_open_from_data_full above */`
	`2179`	`+ mono_image_close (image);`
	`2180`	`+`
`2178`	`2181`	`refass = mono_assembly_get_object_handle (domain, ass, error);`
`2179`	`2182`	`if (!MONO_HANDLE_IS_NULL(refass))`
`2180`	`2183`	`MONO_HANDLE_SET (refass, evidence, evidence);`