Merge pull request #273 from AvaloniaUI/fixes/foldingCrashes

Attempt to prevent folding crashes
AvaloniaUI · Oct 14, 2022 · 6159ad9 · 6159ad9
2 parents 0347e77 + 6ed2d53
commit 6159ad9
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/AvaloniaEdit/Rendering/VisualLineText.cs b/src/AvaloniaEdit/Rendering/VisualLineText.cs
@@ -69,7 +69,14 @@ public override TextRun CreateTextRun(int startVisualColumn, ITextRunConstructio
 				offset,
 				DocumentLength - relativeOffset);
 
-			var textSlice = new ReadOnlySlice<char>(text.Text.AsMemory(), text.Offset, text.Count, RelativeTextOffset);
+            var bufferOffset = RelativeTextOffset;
+
+            if (bufferOffset + text.Count > text.Text.Length)
+            {
+                bufferOffset = 0;
+            }
+
+            var textSlice = new ReadOnlySlice<char>(text.Text.AsMemory(), text.Offset, text.Count, bufferOffset);
 
             return new TextCharacters(textSlice, TextRunProperties);
         }