Merge pull request #1017 from Unity-Technologies/unity-master-bug-1065895

joncham · web-flow · commit e95a39029aaa · 2018-08-21T14:23:54.000-04:00
Don't try to access metadata for dynamic method (case 1065895)
diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c
@@ -2159,6 +2159,10 @@ mono_method_get_marshal_info (MonoMethod *method, MonoMarshalSpec **mspecs)
 		return;
 	}
 
+	/* dynamic method added to non-dynamic image */
+	if (method->dynamic)
+		return;
+
 	mono_class_init (klass);
 
 	methodt = &klass->image->tables [MONO_TABLE_METHOD];

Original file line number	Diff line number	Diff line change
`@@ -2159,6 +2159,10 @@ mono_method_get_marshal_info (MonoMethod method, MonoMarshalSpec *mspecs)`
`2159`	`2159`	`return;`
`2160`	`2160`	`}`
`2161`	`2161`
	`2162`	`+ /* dynamic method added to non-dynamic image */`
	`2163`	`+ if (method->dynamic)`
	`2164`	`+ return;`
	`2165`	`+`
`2162`	`2166`	`mono_class_init (klass);`
`2163`	`2167`
`2164`	`2168`	`methodt = &klass->image->tables [MONO_TABLE_METHOD];`