Fixed an index out of range if the AbstractLineList reported wrong in…

…dex lines
danipen · Feb 1, 2022 · 43b77d5 · 43b77d5
1 parent 079c049
commit 43b77d5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/TextMateSharp/Model/AbstractLineList.cs b/src/TextMateSharp/Model/AbstractLineList.cs
@@ -22,18 +22,27 @@ public void SetModel(TMModel model)
 
         public void AddLine(int line)
         {
-            this.list.Insert(line, new ModelLine());
+            lock (mLock)
+            {
+                this.list.Insert(line, new ModelLine());
+            }
         }
 
         public void RemoveLine(int line)
         {
-            this.list.RemoveAt(line);
+            lock (mLock)
+            {
+                this.list.RemoveAt(line);
+            }
         }
 
         public ModelLine Get(int index)
         {
             lock (mLock)
             {
+                if (index < 0 || index >= this.list.Count)
+                    return null;
+
                 return this.list[index];
             }
         }

diff --git a/src/TextMateSharp/Model/TMModel.cs b/src/TextMateSharp/Model/TMModel.cs
@@ -94,7 +94,9 @@ void ThreadWorker()
                         continue;
                     }
 
-                    if (model.lines.Get(toProcess).IsInvalid)
+                    var modelLine = model.lines.Get(toProcess);
+
+                    if (modelLine != null && modelLine.IsInvalid)
                     {
                         try
                         {