[corlib] Fix for mono#8543 Crash when using Delegate.CreateDelegate w…

…ith DynamicMethod
vivekrajr · Jul 8, 2018 · 7288778 · 7288778
1 parent 998365a
commit 7288778
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/mcs/class/corlib/System/Delegate.cs b/mcs/class/corlib/System/Delegate.cs
@@ -185,6 +185,16 @@ static Delegate CreateDelegate (Type type, object firstArgument, MethodInfo meth
 			if (!type.IsSubclassOf (typeof (MulticastDelegate)))
 				throw new ArgumentException ("type is not a subclass of Multicastdelegate");
 
+			RuntimeType rtType = type as RuntimeType;
+
+			if (rtType == null)
+				throw new ArgumentException ("Type must be a RuntimeType");
+
+			RuntimeMethodInfo rmi = method as RuntimeMethodInfo;
+
+			if (rmi == null)
+				throw new ArgumentException ("MethodInfo must be a RuntimeMethodInfo");
+
 			MethodInfo invoke = type.GetMethod ("Invoke");
 
 			if (!return_type_match (invoke.ReturnType, method.ReturnType)) {