From 6eb9790a0081bfbadd5338a97a23ac683a50c754 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Mon, 20 Jan 2020 19:59:51 +0100 Subject: [PATCH] Fix #1912: NRE in CSharpILMixedLanguage.MixedMethodBodyDisassembler.Disassemble() --- ILSpy/Languages/CSharpILMixedLanguage.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ILSpy/Languages/CSharpILMixedLanguage.cs b/ILSpy/Languages/CSharpILMixedLanguage.cs index 8b4858c75..20e058a76 100644 --- a/ILSpy/Languages/CSharpILMixedLanguage.cs +++ b/ILSpy/Languages/CSharpILMixedLanguage.cs @@ -91,7 +91,7 @@ namespace ICSharpCode.ILSpy CSharpDecompiler decompiler = CreateDecompiler(module, options); var st = decompiler.Decompile(handle); WriteCode(csharpOutput, options.DecompilerSettings, st, decompiler.TypeSystem); - var mapping = decompiler.CreateSequencePoints(st).FirstOrDefault(kvp => (kvp.Key.MoveNextMethod ?? kvp.Key.Method).MetadataToken == handle); + var mapping = decompiler.CreateSequencePoints(st).FirstOrDefault(kvp => (kvp.Key.MoveNextMethod ?? kvp.Key.Method)?.MetadataToken == handle); this.sequencePoints = mapping.Value ?? (IList)EmptyList.Instance; this.codeLines = csharpOutput.ToString().Split(new[] { Environment.NewLine }, StringSplitOptions.None); base.Disassemble(module, handle);