Assembly.Load(string assemblyName) not using StackMark in all cases

[sdmaclea]

Assembly.Load(string assemblyName) not using StackMark in all cases

Root cause seems to be CreateAssemblyName returns an assembly w/o using the callers context.
https://github.com/dotnet/coreclr/blob/58d9cf157f54e8fd61eaaf56b3f8045075d171cd/src/System.Private.CoreLib/src/System/Reflection/RuntimeAssembly.cs#L321-L323

Assembly.LoadWithPartialName(string partialName) not using StackMark ever.

[sdmaclea]

@jkotas proposed fix

diff --git a/src/System.Private.CoreLib/shared/System/Reflection/Assembly.cs b/src/System.Private.CoreLib/shared/System/Reflection/Assembly.cs
index 1e9699f..4722ed3 100644
--- a/src/System.Private.CoreLib/shared/System/Reflection/Assembly.cs
+++ b/src/System.Private.CoreLib/shared/System/Reflection/Assembly.cs
@@ -199,25 +199,6 @@ namespace System.Reflection
 
         public static Assembly Load(byte[] rawAssembly) => Load(rawAssembly, rawSymbolStore: null);
 
-        [Obsolete("This method has been deprecated. Please use Assembly.Load() instead. https://go.microsoft.com/fwlink/?linkid=14202")]
-        public static Assembly LoadWithPartialName(string partialName)
-        {
-            if (partialName == null)
-                throw new ArgumentNullException(nameof(partialName));
-
-            if ((partialName.Length == 0) || (partialName[0] == '\0'))
-                throw new ArgumentException(SR.Format_StringZeroLength, nameof(partialName));
-
-            try
-            {
-                return Load(partialName);
-            }
-            catch (FileNotFoundException)
-            {
-                return null;
-            }
-        }
-
         // Loads the assembly with a COFF based IMAGE containing
         // an emitted assembly. The assembly is loaded into a fully isolated ALC with resolution fully deferred to the AssemblyLoadContext.Default.
         // The second parameter is the raw bytes representing the symbol store that matches the assembly.
diff --git a/src/System.Private.CoreLib/src/System/Reflection/Assembly.CoreCLR.cs b/src/System.Private.CoreLib/src/System/Reflection/Assembly.CoreCLR.cs
index 42736a9..1b03e14 100644
--- a/src/System.Private.CoreLib/src/System/Reflection/Assembly.CoreCLR.cs
+++ b/src/System.Private.CoreLib/src/System/Reflection/Assembly.CoreCLR.cs
@@ -21,7 +21,34 @@ namespace System.Reflection
         public static Assembly Load(string assemblyString)
         {
             StackCrawlMark stackMark = StackCrawlMark.LookForMyCaller;
-            return RuntimeAssembly.InternalLoad(assemblyString, ref stackMark, AssemblyLoadContext.CurrentContextualReflectionContext);
+
+            AssemblyName assemblyRef = new AssemblyName(assemblyString);
+
+            return Load(assemblyRef, ref stackMark, AssemblyLoadContext.CurrentContextualReflectionContext);
+        }
+
+        [Obsolete("This method has been deprecated. Please use Assembly.Load() instead. https://go.microsoft.com/fwlink/?linkid=14202")]
+        [System.Security.DynamicSecurityMethod] // Methods containing StackCrawlMark local var has to be marked DynamicSecurityMethod
+        public static Assembly LoadWithPartialName(string partialName)
+        {
+            if (partialName == null)
+                throw new ArgumentNullException(nameof(partialName));
+
+            if ((partialName.Length == 0) || (partialName[0] == '\0'))
+                throw new ArgumentException(SR.Format_StringZeroLength, nameof(partialName));
+
+            try
+            {
+                StackCrawlMark stackMark = StackCrawlMark.LookForMyCaller;
+
+                AssemblyName assemblyRef = new AssemblyName(partialName);
+
+                return Load(assemblyRef, ref stackMark, AssemblyLoadContext.CurrentContextualReflectionContext);
+            }
+            catch (FileNotFoundException)
+            {
+                return null;
+            }
         }
 
         // Locate an assembly by its name. The name can be strong or

[sdmaclea]

It is not clear to me why these DynamicSecurityMethod Assembly.Load* methods are not in shared/…/Assembly.cs, but are in Assembly.CoreCLR.cs. It seems the public ones in Assembly.CoreCLR.cs could move to shared. To be consistent, I moved LoadWithPartialName to Assembly.CoreCLR.cs

[jkotas]

proposed fix

It looks fine to me. After this fix, there seems to be some dead code (e.g. the CreateAssemblyName method) that can be deleted.

why these DynamicSecurityMethod Assembly.Load* methods are not in shared

StackCrawlMark and the plumbing around it are not portable across runtimes.

I moved LoadWithPartialName to Assembly.CoreCLR.cs

Sounds good to me.

[sdmaclea]

hmmm

if (assemblyName.ContentType == AssemblyContentType.WindowsRuntime)

Never mind