From 2b0f7a2492bbedbf5e381d0468f503a99e834dbc Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Sat, 15 May 2021 11:40:11 +1200
Subject: [PATCH] Fix deserializing mistmatched JToken types in properties
 (#2530)

---
 Src/Newtonsoft.Json.Tests/Issues/Issue2529.cs | 61 +++++++++++++++++++
 .../JsonSerializerInternalReader.cs           |  3 +-
 2 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 Src/Newtonsoft.Json.Tests/Issues/Issue2529.cs

diff --git a/Src/Newtonsoft.Json.Tests/Issues/Issue2529.cs b/Src/Newtonsoft.Json.Tests/Issues/Issue2529.cs
new file mode 100644
index 00000000..5d7cb7b9
--- /dev/null
+++ b/Src/Newtonsoft.Json.Tests/Issues/Issue2529.cs
@@ -0,0 +1,61 @@
+#region License
+// Copyright (c) 2007 James Newton-King
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+#endregion
+
+#if (NET45 || NET50)
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
+using NUnit.Framework;
+#endif
+using System.Collections.Generic;
+using Newtonsoft.Json.Serialization;
+using Newtonsoft.Json.Converters;
+using System.Collections;
+using System;
+using System.IO;
+using Newtonsoft.Json.Linq;
+
+namespace Newtonsoft.Json.Tests.Issues
+{
+    [TestFixture]
+    public class Issue2529 : TestFixtureBase
+    {
+        [Test]
+        public void Test()
+        {
+            Something something = JsonConvert.DeserializeObject<Something>("{ \"foo\": [] }");
+
+            Assert.AreEqual(JTokenType.Array, something.Foo.Type);
+        }
+
+        private class Something
+        {
+            public JToken Foo { get; set; } = JValue.CreateNull();
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs b/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs
index 53b39030..df77f51f 100644
--- a/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs
+++ b/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs
@@ -1113,7 +1113,8 @@ namespace Newtonsoft.Json.Serialization
 
             if ((objectCreationHandling != ObjectCreationHandling.Replace)
                 && (tokenType == JsonToken.StartArray || tokenType == JsonToken.StartObject || propertyConverter != null)
-                && property.Readable)
+                && property.Readable
+                && property.PropertyContract?.ContractType != JsonContractType.Linq)
             {
                 currentValue = property.ValueProvider!.GetValue(target);
                 gottenCurrentValue = true;