Avoid invalid dasharrays

dnfield · Jan 11, 2022 · 65dbfc6 · 65dbfc6
1 parent c728d60
commit 65dbfc6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Fix bug with incorrect fills in some cases of `<use>` elements.
 - Analysis cleanup of Dart code.
 - Fix bug where self-closing `<g>` tags could alter rendering.
+- Fix bug where an invalid `@stroke-dasharray` could cause an infinite loop.
 
 ## 1.0.0
 

diff --git a/example/assets/simple/invalid_dash_array.svg b/example/assets/simple/invalid_dash_array.svg
diff --git a/golden/simple/invalid_dash_array.png b/golden/simple/invalid_dash_array.png
diff --git a/lib/src/svg/xml_parsers.dart b/lib/src/svg/xml_parsers.dart
@@ -139,10 +139,18 @@ CircularIntervalList<double>? parseDashArray(
   }
 
   final List<String> parts = rawDashArray!.split(RegExp(r'[ ,]+'));
-  return CircularIntervalList<double>(parts
-      .map((String part) =>
-          parseDoubleWithUnits(part, fontSize: fontSize, xHeight: xHeight)!)
-      .toList());
+  final List<double> doubles = <double>[];
+  for (final String part in parts) {
+    final double dashOffset =
+        parseDoubleWithUnits(part, fontSize: fontSize, xHeight: xHeight)!;
+    if (dashOffset != 0) {
+      doubles.add(dashOffset);
+    }
+  }
+  if (doubles.isEmpty) {
+    return null;
+  }
+  return CircularIntervalList<double>(doubles);
 }
 
 /// Parses a @stroke-dashoffset into a [DashOffset].