Make sure we don't try to read a character out of bounds

3 years ago · 2f6246c61d
2 changed files with 2 additions and 2 deletions
--- a/src/Skia/Avalonia.Skia/TextShaperImpl.cs
+++ b/src/Skia/Avalonia.Skia/TextShaperImpl.cs
@ -72,7 +72,7 @@ namespace Avalonia.Skia

                    var glyphOffset = GetGlyphOffset(glyphPositions, i, textScale);

-                    if (textSpan[i] == '\t')
+                    if (i < textSpan.Length && textSpan[i] == '\t')
                    {
                        glyphIndex = typeface.GetGlyph(' ');

--- a/src/Windows/Avalonia.Direct2D1/Media/TextShaperImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/TextShaperImpl.cs
@ -68,7 +68,7 @@ namespace Avalonia.Direct2D1.Media

                    var glyphOffset = GetGlyphOffset(glyphPositions, i, textScale);

-                    if (textSpan[i] == '\t')
+                    if (i < textSpan.Length && textSpan[i] == '\t')
                    {
                        glyphIndex = typeface.GetGlyph(' ');