Assume whitespaces can be only on the start, or only at the end, add …

…one more test case that should fail
dotnet · Sep 21, 2021 · 11efcbd · 11efcbd
1 parent 6dab515
commit 11efcbd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.../System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/VersionConverter.cs b/.../System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/VersionConverter.cs
@@ -81,7 +81,7 @@ public override Version Read(ref Utf8JsonReader reader, Type typeToConvert, Json
             }
 #else
             string? versionString = reader.GetString();
-            if (!string.IsNullOrEmpty(versionString) && !char.IsDigit(versionString[0]) && !char.IsDigit(versionString[versionString.Length - 1]))
+            if (!string.IsNullOrEmpty(versionString) && (!char.IsDigit(versionString[0]) || !char.IsDigit(versionString[versionString.Length - 1])))
             {
                 throw ThrowHelper.GetFormatException(DataType.Version);
             }

diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/Value.ReadTests.cs b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/Value.ReadTests.cs
@@ -356,6 +356,7 @@ public static void Version_Read_Success(string json, string? actual = null)
         [InlineData("1.-1")]
         [InlineData("   1.2.3.4")] //Valid but has leading whitespace
         [InlineData("1.2.3.4    ")] //Valid but has trailing whitespace
+        [InlineData("  1.2.3.4  ")] //Valid but has trailing and leading whitespaces
         [InlineData("{}", false)]
         [InlineData("[]", false)]
         [InlineData("true", false)]