CoordinateParser should handle NumState.invalid first (#640)

* CoordinateParser should handle NumState.invalid first * Added test images * Update ReleaseNotes.md * Apply EditorConfig settings
svg-net · Jan 14, 2020 · 2a38deb · 2a38deb
1 parent f3991b4
commit 2a38deb
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 5 deletions.
diff --git a/Source/Paths/CoordinateParser.cs b/Source/Paths/CoordinateParser.cs
@@ -274,6 +274,12 @@ public bool TryGetFloat(out float result)
                         break;
                 }
 
+                if (_newState == NumState.invalid)
+                {
+                    result = float.MinValue;
+                    return MarkState(false);
+                }
+
                 if (_newState < _currState)
                 {
                     result = float.Parse(_coords.Substring(Position, i - Position), NumberStyles.Float, CultureInfo.InvariantCulture);
@@ -286,11 +292,6 @@ public bool TryGetFloat(out float result)
                     Position = i;
                 }
 
-                if (_newState == NumState.invalid)
-                {
-                    result = float.MinValue;
-                    return MarkState(false);
-                }
                 _currState = _newState;
                 ++i;
             }

diff --git a/Tests/Svg.UnitTests/PassingTests.csv b/Tests/Svg.UnitTests/PassingTests.csv
@@ -247,5 +247,7 @@ __pull_request-551-01
 __pull_request-564-01
 __pull_request-564-02
 __pull_request-575-01
+__pull_request-640-01
+__pull_request-640-02
 __Telefunken_FuBK_test_pattern
 __title
diff --git a/Tests/W3CTestSuite/PassingTests.txt b/Tests/W3CTestSuite/PassingTests.txt
@@ -279,6 +279,8 @@ __pull_request-551-01.svg
 __pull_request-564-01.svg
 __pull_request-564-02.svg
 __pull_request-575-01.svg
+__pull_request-640-01.svg
+__pull_request-640-02.svg
 __AJ_Digital_Camera.svg
 __Telefunken_FuBK_test_pattern.svg
 __tiger.svg

diff --git a/Tests/W3CTestSuite/png/__pull_request-640-01.png b/Tests/W3CTestSuite/png/__pull_request-640-01.png
diff --git a/Tests/W3CTestSuite/png/__pull_request-640-02.png b/Tests/W3CTestSuite/png/__pull_request-640-02.png
diff --git a/Tests/W3CTestSuite/svg/__pull_request-640-01.svg b/Tests/W3CTestSuite/svg/__pull_request-640-01.svg
diff --git a/Tests/W3CTestSuite/svg/__pull_request-640-02.svg b/Tests/W3CTestSuite/svg/__pull_request-640-02.svg
diff --git a/doc/ReleaseNotes.md b/doc/ReleaseNotes.md
@@ -15,6 +15,7 @@ The release versions are NuGet releases.
 ### Fixes
 * fixed nested svg tags not rendered properly (see [#622](https://github.com/vvvv/SVG/issues/622))
 * added handling of invalid property in parser (see [#632](https://github.com/vvvv/SVG/issues/632))
+* fixed CoordinateParser handling of invalid state (see [PR #640](https://github.com/vvvv/SVG/pull/640))
 
 ## [Version 3.0.84](https://www.nuget.org/packages/Svg/3.0.84)