Correctly parse JSON from string (#32393)

dotnet · Nov 23, 2023 · c5262bb · c5262bb
1 parent 84505e3
commit c5262bb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/src/EFCore/Storage/Json/JsonCollectionReaderWriter.cs b/src/EFCore/Storage/Json/JsonCollectionReaderWriter.cs
@@ -46,11 +46,6 @@ public JsonCollectionReaderWriter(JsonValueReaderWriter<TElement> elementReaderW
             collection.Clear();
         }
 
-        if (manager.CurrentReader.TokenType == JsonTokenType.None)
-        {
-            manager.MoveNext();
-        }
-
         var tokenType = manager.CurrentReader.TokenType;
         if (tokenType != JsonTokenType.StartArray)
         {

diff --git a/src/EFCore/Storage/Json/JsonValueReaderWriter.cs b/src/EFCore/Storage/Json/JsonValueReaderWriter.cs
@@ -64,6 +64,7 @@ internal JsonValueReaderWriter()
     public object FromJsonString(string json, object? existingObject = null)
     {
         var readerManager = new Utf8JsonReaderManager(new JsonReaderData(Encoding.UTF8.GetBytes(json)), null);
+        readerManager.MoveNext();
         return FromJson(ref readerManager, existingObject);
     }
 

diff --git a/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj b/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj
@@ -48,6 +48,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\EFCore\EFCore.csproj" />
+    <ProjectReference Include="..\..\src\EFCore.Analyzers\EFCore.Analyzers.csproj" />
     <ProjectReference Include="..\..\src\EFCore.Design\EFCore.Design.csproj" />
     <ProjectReference Include="..\..\src\EFCore.Proxies\EFCore.Proxies.csproj" />
     <ProjectReference Include="..\..\src\EFCore.Abstractions\EFCore.Abstractions.csproj" />

diff --git a/test/EFCore.Specification.Tests/JsonTypesTestBase.cs b/test/EFCore.Specification.Tests/JsonTypesTestBase.cs
@@ -3505,6 +3505,10 @@ protected virtual void Can_read_and_write_JSON_value<TEntity, TModel>(
         var jsonReaderWriter = property.GetJsonValueReaderWriter()
             ?? property.GetTypeMapping().JsonValueReaderWriter!;
 
+        var toString = value == null ? null : jsonReaderWriter.ToJsonString(value);
+        var fromString = toString == null ? null : jsonReaderWriter.FromJsonString(toString, existingObject);
+        Assert.Equal(value, fromString);
+
         var actual = ToJsonPropertyString(jsonReaderWriter, value);
         Assert.Equal(json, actual);
 
@@ -3782,7 +3786,10 @@ public override Geometry FromJsonTyped(ref Utf8JsonReaderManager manager, object
                         throw new ArgumentOutOfRangeException();
                 }
 
-                manager.MoveNext();
+                if (depth > 0)
+                {
+                    manager.MoveNext();
+                }
             }
             while (depth > 0);