Merge pull request #163 from lucaslorentz/fix-nullreference-exception

Fix null reference exceptions in ResolveOriginalMethod
lucaslorentz · Apr 4, 2023 · 4d1ebaf · 4d1ebaf
2 parents c4f476c + 64be0ef
commit 4d1ebaf
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/MiniCover.Core/Extensions/MethodDefinitionExtensions.cs b/src/MiniCover.Core/Extensions/MethodDefinitionExtensions.cs
@@ -52,11 +52,15 @@ public static bool IsExcludedFromCodeCoverage(this MethodDefinition methodDefini
 
         public static MethodDefinition ResolveOriginalMethod(this MethodDefinition methodDefinition)
         {
-            var originalMethodName = ExtractOriginalMethodName(methodDefinition.Name)
-                ?? ExtractOriginalMethodName(methodDefinition.DeclaringType.Name);
+            var originalMethodName = ExtractOriginalMethodName(methodDefinition.Name);
+
+            if (originalMethodName == null && methodDefinition.DeclaringType != null)
+                originalMethodName = ExtractOriginalMethodName(methodDefinition.DeclaringType.Name);
 
             if (!string.IsNullOrEmpty(originalMethodName)
-                && methodDefinition.DeclaringType.IsCompilerGenerated())
+                && methodDefinition.DeclaringType != null
+                && methodDefinition.DeclaringType.IsCompilerGenerated()
+                && methodDefinition.DeclaringType.DeclaringType != null)
             {
                 var originalMethod = methodDefinition.DeclaringType.DeclaringType.Methods
                     .FirstOrDefault(m => m.Name == originalMethodName);