Merge pull request #404 from webmaster442/master

Fixes issue #303
xoofx · Mar 8, 2020 · 70ee97d · 70ee97d
2 parents da916a1 + 2f0dd2a
commit 70ee97d
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 2 deletions.
diff --git a/src/Markdig.Tests/TestExceptionNotThrown.cs b/src/Markdig.Tests/TestExceptionNotThrown.cs
@@ -0,0 +1,48 @@
+using NUnit.Framework;
+
+namespace Markdig.Tests
+{
+    [TestFixture]
+    public class TestExceptionNotThrown
+    {
+        [Test]
+        public void DoesNotThrowIndexOutOfRangeException1()
+        {
+            Assert.DoesNotThrow(() =>
+            {
+                var pipeline = new MarkdownPipelineBuilder().UseAdvancedExtensions().Build();
+                Markdown.ToHtml("+-\n|\n+", pipeline);
+            });
+        }
+
+        [Test]
+        public void DoesNotThrowIndexOutOfRangeException2()
+        {
+            Assert.DoesNotThrow(() =>
+            {
+                var pipeline = new MarkdownPipelineBuilder().UseAdvancedExtensions().Build();
+                Markdown.ToHtml("+--\n|\n+0", pipeline);
+            });
+        }
+
+        [Test]
+        public void DoesNotThrowIndexOutOfRangeException3()
+        {
+            Assert.DoesNotThrow(() =>
+            {
+                var pipeline = new MarkdownPipelineBuilder().UseAdvancedExtensions().Build();
+                Markdown.ToHtml("+-\n|\n+\n0", pipeline);
+            });
+        }
+
+        [Test]
+        public void DoesNotThrowIndexOutOfRangeException4()
+        {
+            Assert.DoesNotThrow(() =>
+            {
+                var pipeline = new MarkdownPipelineBuilder().UseAdvancedExtensions().Build();
+                Markdown.ToHtml("+-\n|\n+0", pipeline);
+            });
+        }
+    }
+}
diff --git a/src/Markdig/Extensions/Tables/Table.cs b/src/Markdig/Extensions/Tables/Table.cs
@@ -58,6 +58,11 @@ public bool IsValid()
                     var rowSpan = cell.RowSpan - 1;
                     while (rowSpan > 0)
                     {
+                        if (i+rowSpan > (rows.Length-1))
+                        {
+                            return false;
+                        }
+
                         rows[i + rowSpan] += cell.ColumnSpan;
                         rowSpan--;
                     }

diff --git a/src/Markdig/Helpers/StringSlice.cs b/src/Markdig/Helpers/StringSlice.cs
@@ -315,7 +315,8 @@ public bool TrimStart()
             // Strip leading spaces
             for (; Start <= End; Start++)
             {
-                if (!Text[Start].IsWhitespace())
+                if (Start < Text.Length
+                    && !Text[Start].IsWhitespace())
                 {
                     break;
                 }
@@ -349,7 +350,8 @@ public bool TrimEnd()
         {
             for (; Start <= End; End--)
             {
-                if (!Text[End].IsWhitespace())
+                if (End < Text.Length
+                   && !Text[End].IsWhitespace())
                 {
                     break;
                 }