vm: Fix ExitBlock crashing when stack only contains one element

PaddiM8 · Dec 5, 2024 · 6085cce · 6085cce
1 parent 3b56b6a
commit 6085cce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Vm/InstructionExecutor.cs b/src/Vm/InstructionExecutor.cs
@@ -652,6 +652,9 @@ private void UnpackUpper(byte count)
 
     private void ExitBlock(byte popCount)
     {
+        if (_stack.Count == 1)
+            return;
+
         var returnValue = _stack.Pop();
         for (byte i = 0; i < popCount; i++)
             Pop();

diff --git a/src/Vm/InstructionGenerator.cs b/src/Vm/InstructionGenerator.cs
@@ -453,7 +453,8 @@ private void ExitBlock(bool isPrimaryExitPoint, int? newScopeDepth = null)
         if (popCount > byte.MaxValue)
             throw new RuntimeException("Too many variables in block");
 
-        Emit(InstructionKind.ExitBlock, (byte)popCount);
+        if (popCount > 0)
+            Emit(InstructionKind.ExitBlock, (byte)popCount);
     }
 
     private void ClearBlock(bool isPrimaryExitPoint, int? newScopeDepth = null)