Prevent crashes on zero length segments or paths

- fixes __tiger.svg test image
lividus · Mar 11, 2017 · ac31614 · ac31614
1 parent f918193
commit ac31614
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/Source/Paths/SvgClosePathSegment.cs b/Source/Paths/SvgClosePathSegment.cs
@@ -8,10 +8,15 @@ public sealed class SvgClosePathSegment : SvgPathSegment
     {
         public override void AddToPath(System.Drawing.Drawing2D.GraphicsPath graphicsPath)
         {
+            if (graphicsPath.PointCount == 0)
+            {
+                return;
+            }
+
             // Important for custom line caps.  Force the path the close with an explicit line, not just an implicit close of the figure.
             var pathPoints = graphicsPath.PathPoints;
 
-            if (pathPoints.Length > 0 && !pathPoints[0].Equals(pathPoints[pathPoints.Length - 1]))
+            if (!pathPoints[0].Equals(pathPoints[pathPoints.Length - 1]))
             {
                 var pathTypes = graphicsPath.PathTypes;
                 int i = pathPoints.Length - 1;

diff --git a/Source/Paths/SvgLineSegment.cs b/Source/Paths/SvgLineSegment.cs
@@ -15,7 +15,10 @@ public SvgLineSegment(PointF start, PointF end)
 
         public override void AddToPath(System.Drawing.Drawing2D.GraphicsPath graphicsPath)
         {
-            graphicsPath.AddLine(this.Start, this.End);
+            if (this.Start != this.End)
+            {
+                graphicsPath.AddLine(this.Start, this.End);
+            }
         }
 
         public override string ToString()

diff --git a/Source/Paths/SvgMoveToSegment.cs b/Source/Paths/SvgMoveToSegment.cs
@@ -15,7 +15,10 @@ public SvgMoveToSegment(PointF moveTo)
 
         public override void AddToPath(System.Drawing.Drawing2D.GraphicsPath graphicsPath)
         {
-            graphicsPath.StartFigure();
+            if (this.Start != this.End)
+            {
+                graphicsPath.StartFigure();
+            }
         }
 
         public override string ToString()