fix point read from empty path (#173)

pocketsvg · Feb 12, 2020 · c89d831 · c89d831
1 parent 60bf6ea
commit c89d831
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/SVGEngine.mm b/SVGEngine.mm
@@ -602,9 +602,11 @@ CGPathRef CGPathFromSVGPathString(NSString *svgString) {
     }
 
     for(NSUInteger i = 0; i < _operands.size(); i += 2) {
-        CGPoint currentPoint = CGPathGetCurrentPoint(_path);
-        CGFloat x = _operands[i+0] + (_cmd == 'm' ? currentPoint.x : 0);
-        CGFloat y = _operands[i+1] + (_cmd == 'm' ? currentPoint.y : 0);
+        CGPoint currentPoint = (_cmd == 'm' && !CGPathIsEmpty(_path))
+            ? CGPathGetCurrentPoint(_path)
+            : CGPointZero;
+        CGFloat x = _operands[i+0] + currentPoint.x;
+        CGFloat y = _operands[i+1] + currentPoint.y;
 
         if(i == 0)
             CGPathMoveToPoint(_path, NULL, x, y);