[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mono-patches
Subject:    [Mono-patches] r99461 - in trunk/mcs/class/corlib: System
From:       "Mark Probst (mprobst () novell ! com)" <mono-patches-list () lists ! ximian ! com>
Date:       2008-03-31 19:20:17
Message-ID: 20080331192017.CEFB29472C () mono-cvs ! ximian ! com
[Download RAW message or body]

Author: mprobst
Date: 2008-03-31 14:20:17 -0500 (Mon, 31 Mar 2008)
New Revision: 99461

Modified:
   trunk/mcs/class/corlib/System.Reflection/ChangeLog
   trunk/mcs/class/corlib/System.Reflection/MonoMethod.cs
   trunk/mcs/class/corlib/System/ChangeLog
   trunk/mcs/class/corlib/System/MonoType.cs
Log:
2008-03-31  Mark Probst  <mark.probst@gmail.com>

	* MonoMethod.cs: Don't do CAS security checks in Invoke for 2.1
	profile.

2008-03-31  Mark Probst  <mark.probst@gmail.com>

	* MonoType.cs: Don't do CAS security checks in CheckMethodSecurity
	for 2.1 profile.


Modified: trunk/mcs/class/corlib/System/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System/ChangeLog	2008-03-31 19:06:11 UTC (rev 99460)
+++ trunk/mcs/class/corlib/System/ChangeLog	2008-03-31 19:20:17 UTC (rev 99461)
@@ -1,3 +1,8 @@
+2008-03-31  Mark Probst  <mark.probst@gmail.com>
+
+	* MonoType.cs: Don't do CAS security checks in CheckMethodSecurity
+	for 2.1 profile.
+
 2008-03-28  Marek Safar  <marek.safar@gmail.com>
 
 	* Nullable.cs (Box): Do things explicitly and not rely on broken gmcs

Modified: trunk/mcs/class/corlib/System/MonoType.cs
===================================================================
--- trunk/mcs/class/corlib/System/MonoType.cs	2008-03-31 19:06:11 UTC (rev 99460)
+++ trunk/mcs/class/corlib/System/MonoType.cs	2008-03-31 19:20:17 UTC (rev 99461)
@@ -641,6 +641,9 @@
 
 		private MethodBase CheckMethodSecurity (MethodBase mb)
 		{
+#if NET_2_1
+			return mb;
+#else
 			if (!SecurityManager.SecurityEnabled || (mb == null))
 				return mb;
 
@@ -651,6 +654,7 @@
 
 			// this (unlike the Invoke step) is _and stays_ a LinkDemand (caller)
 			return SecurityManager.ReflectedLinkDemandQuery (mb) ? mb : null;
+#endif
 		}
 
 		void ReorderParamArrayArguments(ref object[] args, MethodBase method)

Modified: trunk/mcs/class/corlib/System.Reflection/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Reflection/ChangeLog	2008-03-31 19:06:11 UTC (rev 99460)
+++ trunk/mcs/class/corlib/System.Reflection/ChangeLog	2008-03-31 19:20:17 UTC (rev 99461)
@@ -1,3 +1,8 @@
+2008-03-31  Mark Probst  <mark.probst@gmail.com>
+
+	* MonoMethod.cs: Don't do CAS security checks in Invoke for 2.1
+	profile.
+
 2008-03-25  Zoltan Varga  <vargaz@gmail.com>
 
 	* MonoCMethod.cs (Invoke): Avoid a crash if this is called on a ctor of an open

Modified: trunk/mcs/class/corlib/System.Reflection/MonoMethod.cs
===================================================================
--- trunk/mcs/class/corlib/System.Reflection/MonoMethod.cs	2008-03-31 19:06:11 UTC (rev 99460)
+++ trunk/mcs/class/corlib/System.Reflection/MonoMethod.cs	2008-03-31 19:20:17 UTC (rev 99461)
@@ -133,12 +133,14 @@
 			if (!Binder.ConvertArgs (binder, parameters, pinfo, culture))
 				throw new ArgumentException ("parameters");
 
+#if !NET_2_1
 			if (SecurityManager.SecurityEnabled) {
 				// sadly Attributes doesn't tell us which kind of security action this is so
 				// we must do it the hard way - and it also means that we can skip calling
 				// Attribute (which is another an icall)
 				SecurityManager.ReflectedLinkDemandInvoke (this);
 			}
+#endif
 
 #if NET_2_0
 			if (ContainsGenericParameters)

_______________________________________________
Mono-patches maillist  -  Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
[prev in list] [next in list] [prev in thread] [next in thread]