Merge pull request #1006 from Unity-Technologies/unity-master-fix-unstable-android

mderoy · web-flow · commit 7e7a83f5efa2 · 2018-08-06T09:47:22.000-04:00
Fix double gchandle free in thread detach logic (1062208)
diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c
@@ -3054,8 +3054,6 @@ thread_detach (MonoThreadInfo *info)
 	internal = (MonoInternalThread*) mono_gchandle_get_target (gchandle);
 	g_assert (internal);
 
-	mono_gchandle_free (gchandle);
-
 	mono_thread_detach_internal (internal);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3054,8 +3054,6 @@ thread_detach (MonoThreadInfo *info)`
`3054`	`3054`	`internal = (MonoInternalThread*) mono_gchandle_get_target (gchandle);`
`3055`	`3055`	`g_assert (internal);`
`3056`	`3056`
`3057`		`- mono_gchandle_free (gchandle);`
`3058`		`-`
`3059`	`3057`	`mono_thread_detach_internal (internal);`
`3060`	`3058`	`}`
`3061`	`3059`