Protect the code agains corrupted grammars

danipen · Jan 14, 2022 · eb755da · eb755da
1 parent 20f563d
commit eb755da
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/TextMateSharp/Internal/Grammars/LineTokenizer.cs b/src/TextMateSharp/Internal/Grammars/LineTokenizer.cs
@@ -252,6 +252,10 @@ private IMatchResult MatchRule(Grammar grammar, string lineText, in bool isFirst
                 return null;
 
             ICompiledRule ruleScanner = rule.Compile(grammar, stack.endRule, isFirstLine, linePos == anchorPosition);
+
+            if (ruleScanner == null)
+                return null;
+
             IOnigNextMatchResult r = ruleScanner.scanner.FindNextMatchSync(lineText, linePos);
 
             if (r != null)

diff --git a/src/TextMateSharp/Internal/Rules/CaptureRule.cs b/src/TextMateSharp/Internal/Rules/CaptureRule.cs
@@ -13,12 +13,12 @@ public CaptureRule(int? id, string name, string contentName, int? retokenizeCapt
 
         public override void CollectPatternsRecursive(IRuleRegistry grammar, RegExpSourceList sourceList, bool isFirst)
         {
-            throw new InvalidOperationException("Not supported");
+
         }
 
         public override ICompiledRule Compile(IRuleRegistry grammar, string endRegexSource, bool allowA, bool allowG)
         {
-            throw new InvalidOperationException("Not supported");
+            return null;
         }
 
     }

diff --git a/src/TextMateSharp/Model/TMModel.cs b/src/TextMateSharp/Model/TMModel.cs
@@ -189,12 +189,15 @@ public int UpdateTokensInRange(ModelTokensChangedEventBuilder eventBuilder, int
                     try
                     {
                         text = model.lines.GetLineText(lineIndex);
+                        if (text == null)
+                            continue;
                         // Tokenize only the first X characters
                         r = model.tokenizer.Tokenize(text, modeLine.GetState(), 0, MAX_LEN_TO_TOKENIZE);
                     }
                     catch (Exception e)
                     {
                         System.Diagnostics.Debug.WriteLine(e.Message);
+                        continue;
                     }
 
                     if (r != null && r.Tokens != null && r.Tokens.Count != 0)