From 53c4cb64de229083bf76e81e51f4bd6410265f23 Mon Sep 17 00:00:00 2001
From: susliko <1istoobig@gmail.com>
Date: Fri, 22 Dec 2023 00:07:40 +0300
Subject: [PATCH] Fix crashes inside Markdown

Resolves #365
Problem
---
Parsing Markdown with nested Scala code using significant indentation crashes with SIGSEGV
Example code:
```scala
for
  i <- 1 to 10
yield i
```

Solution
---
Stop calling `lexer->get_column` in `scanner.c` without prior eof-checks
---
 src/scanner.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/scanner.c b/src/scanner.c
index b20bd02..fac9bd0 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -117,7 +117,6 @@ bool tree_sitter_scala_external_scanner_scan(void *payload, TSLexer *lexer,
   int prev = peekStack(stack);
   int newline_count = 0;
   int indentation_size = 0;
-  LOG("scanner was called at column: %d\n", lexer->get_column(lexer));
 
   while (iswspace(lexer->lookahead)) {
     if (lexer->lookahead == '\n') {
@@ -191,18 +190,16 @@ bool tree_sitter_scala_external_scanner_scan(void *payload, TSLexer *lexer,
   }
 
   // Recover newline_count from the outdent reset
+  bool is_eof = lexer->eof(lexer);
   if (stack->last_newline_count > 0 &&
-    ((lexer->eof(lexer) && stack->last_column == -1)
-      || lexer->get_column(lexer) == stack->last_column)) {
+    ((is_eof && stack->last_column == -1) || 
+      (!is_eof && lexer->get_column(lexer) == stack->last_column))) {
     newline_count += stack->last_newline_count;
   }
   stack->last_newline_count = 0;
 
   printStack(stack, "    after");
 
-  LOG("    indentation_size: %d, newline_count: %d, column: %d, indent_is_valid: %d, dedent_is_valid: %d\n", indentation_size,
-      newline_count, lexer->get_column(lexer), valid_symbols[INDENT], valid_symbols[OUTDENT]);
-
   if (valid_symbols[AUTOMATIC_SEMICOLON] && newline_count > 0) {
     // AUTOMATIC_SEMICOLON should not be issued in the middle of expressions
     // Thus, we exit this branch when encountering comments, else/catch clauses, etc.