fixes NullReferenceException on void returning methods with explicit …

…return statements (#264)
adrianoc · Apr 1, 2024 · f2d5888 · f2d5888
1 parent 0d511d4
commit f2d5888
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/Cecilifier.Core.Tests/Tests/Unit/MethodTests.cs b/Cecilifier.Core.Tests/Tests/Unit/MethodTests.cs
@@ -90,4 +90,14 @@ class Derived : Base
             \s+\2Ret\);
             """));
     }
+
+    [TestCase("void M() { return; }")]
+    [TestCase("void M(int i) { if(i > 10) return; }")]
+    [TestCase("class Foo { void M() { return; } }")]
+    public void VoidReturningMethod_WithExplicitReturn_DoesNotCrash(string code)
+    {
+        var result = RunCecilifier(code);
+
+        Assert.Pass("Works");
+    }
 }
diff --git a/Cecilifier.Core/AST/ExpressionVisitor.cs b/Cecilifier.Core/AST/ExpressionVisitor.cs
@@ -157,7 +157,8 @@ internal static bool VisitAndPopIfNotConsumed(IVisitorContext ctx, string ilVar,
         public override void VisitReturnStatement(ReturnStatementSyntax node)
         {
             using var _ = LineInformationTracker.Track(Context, node);
-            Utils.EnsureNotNull(node.Expression);
+            if (node.Expression == null)
+                return;
             node.Expression.Accept(this);
             InjectRequiredConversions(node.Expression);
         }