From 15eabd92525b5333f46dd1e13047d1024a9b45b5 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Tue, 5 Jan 2021 18:48:50 -0500 Subject: [PATCH] Pass an alc to Assembly.Load() in GetSatelliteAssembly() to avoid a stack walk. (#46534) --- .../System.Private.CoreLib/src/System/Reflection/RuntimeAssembly.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/netcore/System.Private.CoreLib/src/System/Reflection/RuntimeAssembly.cs b/src/mono/netcore/System.Private.CoreLib/src/System/Reflection/RuntimeAssembly.cs index f9434d7..602cdc6 100644 --- a/src/mono/netcore/System.Private.CoreLib/src/System/Reflection/RuntimeAssembly.cs +++ b/src/mono/netcore/System.Private.CoreLib/src/System/Reflection/RuntimeAssembly.cs @@ -396,7 +396,7 @@ namespace System.Reflection try { StackCrawlMark unused = default; - res = Load(an, ref unused, null); + res = Load(an, ref unused, AssemblyLoadContext.GetLoadContext(assembly)); } catch { -- 2.7.4