From edc5ab69794b47bb65d934588459ed22629e0a69 Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Thu, 4 Aug 2022 14:42:30 +0800
Subject: [PATCH] Fix deserializing via constructor with ignored base type
 properties

---
 Src/Newtonsoft.Json.Tests/Issues/Issue2708.cs | 81 +++++++++++++++++++
 .../JsonSerializerInternalReader.cs           |  7 ++
 2 files changed, 88 insertions(+)
 create mode 100644 Src/Newtonsoft.Json.Tests/Issues/Issue2708.cs

diff --git a/Src/Newtonsoft.Json.Tests/Issues/Issue2708.cs b/Src/Newtonsoft.Json.Tests/Issues/Issue2708.cs
new file mode 100644
index 000000000..149544e18
--- /dev/null
+++ b/Src/Newtonsoft.Json.Tests/Issues/Issue2708.cs
@@ -0,0 +1,81 @@
+#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 !NET20
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading;
+using Newtonsoft.Json.Linq;
+#if DNXCORE50
+using System.Reflection;
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
+using NUnit.Framework;
+#endif
+
+namespace Newtonsoft.Json.Tests.Issues
+{
+    [TestFixture]
+    public class Issue2708 : TestFixtureBase
+    {
+        [Test]
+        public void Test()
+        {
+            string json = @"
+{
+  ""Name"": ""MyName"",
+  ""ChildClassProp"": ""MyValue"",
+}";
+
+            var record = JsonConvert.DeserializeObject<MyRecord>(json);
+            Assert.AreEqual(null, record.Name); // Not set because doesn't have DataMember
+            Assert.AreEqual("MyValue", record.ChildClassProp);
+        }
+
+        [DataContract]
+        public abstract class RecordBase
+        {
+            [JsonExtensionData]
+            protected IDictionary<string, JToken> additionalData;
+
+            public string Name { get; set; }
+        }
+
+        [DataContract]
+        public class MyRecord : RecordBase
+        {
+            public MyRecord(string childClassProp) => ChildClassProp = childClassProp;
+
+            [DataMember]
+            public string ChildClassProp { get; set; }
+        }
+    }
+}
+#endif
diff --git a/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs b/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs
index 4ef652b6b..d43367cc3 100644
--- a/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs
+++ b/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs
@@ -2244,6 +2244,13 @@ private List<CreatorPropertyContext> ResolvePropertyAndCreatorValues(JsonObjectC
                                 
                                 continue;
                             }
+                            else
+                            {
+                                if (!reader.Read())
+                                {
+                                    throw JsonSerializationException.Create(reader, "Unexpected end when setting {0}'s value.".FormatWith(CultureInfo.InvariantCulture, memberName));
+                                }
+                            }
                         }
                         else
                         {