fix if-else-endif crash

Shylie · Apr 4, 2020 · 5427dcf · 5427dcf
1 parent 5234c70
commit 5427dcf
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/shyll/compiler.cpp b/shyll/compiler.cpp
@@ -368,7 +368,13 @@ bool Compiler::Instruction()
 	case Token::Type::If:
 	{
 		Token ifStart = *CurrentToken();
+		Token elseStart;
 		currentToken++;
+		if (!CurrentToken())
+		{
+			ErrorAt(*PreviousToken(), "Unterminated if statement");
+			break;
+		}
 		uint16_t ifOffset = EmitJump(OpCode::JumpIfFalse);
 		uint16_t elseOffset = 0;
 
@@ -395,13 +401,19 @@ bool Compiler::Instruction()
 				}
 				else
 				{
+					elseStart = *CurrentToken();
 					elseOffset = EmitJump(OpCode::Jump);
 					PatchJump(ifOffset);
 					ifPatched = true;
 					currentToken++;
 				}
 			}
 		}
+		if (!CurrentToken())
+		{
+			ErrorAt((ifPatched ? elseStart : ifStart), (ifPatched ? "Unterminated else statement" : "Unterminated if statement"));
+			break;
+		}
 		PatchJump(ifPatched ? elseOffset : ifOffset);
 		break;
 	}