Fix null reference exception in library mode (#1546)

dotnet · Sep 9, 2021 · 4d83e37 · 4d83e37
1 parent 6f2cfcd
commit 4d83e37
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...CoreLib/src/Internal/Runtime/CompilerHelpers/StartupCode/StartupCodeHelpers.Reflection.cs b/...CoreLib/src/Internal/Runtime/CompilerHelpers/StartupCode/StartupCodeHelpers.Reflection.cs
@@ -16,9 +16,9 @@ internal static void InitializeEntryAssembly(RuntimeTypeHandle entryAssemblyType
             s_entryAssemblyType = entryAssemblyType;
         }
 
-        internal static Assembly GetEntryAssembly()
+        internal static Assembly? GetEntryAssembly()
         {
-            return Type.GetTypeFromHandle(s_entryAssemblyType).Assembly;
+            return Type.GetTypeFromHandle(s_entryAssemblyType)?.Assembly;
         }
     }
 }
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Assembly.CoreRT.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Assembly.CoreRT.cs
@@ -12,7 +12,7 @@ namespace System.Reflection
 {
     public abstract partial class Assembly : ICustomAttributeProvider, ISerializable
     {
-        private static Assembly GetEntryAssemblyInternal() => Internal.Runtime.CompilerHelpers.StartupCodeHelpers.GetEntryAssembly();
+        private static Assembly? GetEntryAssemblyInternal() => Internal.Runtime.CompilerHelpers.StartupCodeHelpers.GetEntryAssembly();
 
         [System.Runtime.CompilerServices.Intrinsic]
         public static Assembly GetExecutingAssembly() { throw NotImplemented.ByDesign; } //Implemented by toolchain.