Add null guard when calling TryGetDebugInformation

MindscapeHQ · Sep 11, 2024 · 3e19ada · 3e19ada
1 parent a7a45a4
commit 3e19ada
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Mindscape.Raygun4Net.Core/Diagnostics/PortableExecutableReaderExtensions.cs b/Mindscape.Raygun4Net.Core/Diagnostics/PortableExecutableReaderExtensions.cs
@@ -26,6 +26,12 @@ public static PEReader GetFileSystemPEReader(string moduleName)
 
   public static bool TryGetDebugInformation(this PEReader peReader, out PEDebugInformation debugInformation)
   {
+    if (peReader is null)
+    {
+      debugInformation = null;
+      return false;
+    }
+
     try
     {
       debugInformation = GetDebugInformation(peReader);

diff --git a/Mindscape.Raygun4Net.NetCore.Common/Diagnostics/PortableExecutableReaderExtensions.cs b/Mindscape.Raygun4Net.NetCore.Common/Diagnostics/PortableExecutableReaderExtensions.cs
@@ -26,8 +26,14 @@ internal static class PortableExecutableReaderExtensions
     }
   }
 
-  public static bool TryGetDebugInformation(this PEReader peReader, out PEDebugInformation? debugInformation)
+  public static bool TryGetDebugInformation(this PEReader? peReader, out PEDebugInformation? debugInformation)
   {
+    if (peReader is null)
+    {
+      debugInformation = null;
+      return false;
+    }
+
     try
     {
       debugInformation = GetDebugInformation(peReader);