From 168f1ac3ff13b0514e2123e35b7debe9f966d670 Mon Sep 17 00:00:00 2001
From: Kyle Ambroff <kyle@ambroff.com>
Date: Fri, 24 Sep 2010 15:49:44 -0700
Subject: [PATCH] [corlib] version tolerant serialization fails with missing
 primitive members

Modifies ObjectReader so that when it encounters a primitive typed member in
an object stream which has no corresponding member in the app domain, it will
read the value anyway and throw it away. That way it can read the next block
from the stream.

Added a unit test which passes with the changes to ObjectReader.

Fixes bug #641821.
---
 mcs/class/corlib/Makefile                     |  2 ++
 .../ObjectReader.cs                           | 17 ++++++++++----
 .../BinarySerializationOverVersions.cs        | 12 ++++++++++
 .../6.0/Address.cs                            | 22 +++++++++++++++++++
 4 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 mcs/class/corlib/Test/System.Runtime.Serialization.Formatters.Binary/VersionTolerantSerialization/VersionTolerantSerializationTestLib/6.0/Address.cs

diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile
index 25cdd80c95aa..5f6733df4bdb 100644
--- a/mcs/class/corlib/Makefile
+++ b/mcs/class/corlib/Makefile
@@ -90,6 +90,8 @@ test-vts:
 		$(vtsdir)/$(vts)TestLib/4.0/Address.cs
 	$(MCS) -target:library \
 		$(vtsdir)/$(vts)TestLib/5.0/Address.cs
+	$(MCS) -target:library \
+		$(vtsdir)/$(vts)TestLib/6.0/Address.cs
 run-test-vts: test-vts
 	$(TEST_RUNTIME) $(RUNTIME_FLAGS) $(TEST_HARNESS) -noshadow \
 		$(vtsdir)/BinarySerializationOverVersions.exe 
diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs
index 3393930dae5b..dd9b27513a8e 100644
--- a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs
@@ -294,13 +294,22 @@ private void ReadObjectContent (BinaryReader reader, TypeMetadata metadata, long
 				
 			info = metadata.NeedsSerializationInfo ? new SerializationInfo(metadata.Type, new FormatterConverter()) : null;
 
-   			if (metadata.MemberNames != null)
+			if (metadata.MemberNames != null) {
 				for (int n=0; n<metadata.FieldCount; n++)
 					ReadValue (reader, objectInstance, objectId, info, metadata.MemberTypes[n], metadata.MemberNames[n], null, null);
-			else
-				for (int n=0; n<metadata.FieldCount; n++)
+			} else
+				for (int n=0; n<metadata.FieldCount; n++) {
 					if (metadata.MemberInfos [n] != null)
-					ReadValue (reader, objectInstance, objectId, info, metadata.MemberTypes[n], metadata.MemberInfos[n].Name, metadata.MemberInfos[n], null);
+						ReadValue (reader, objectInstance, objectId, info, metadata.MemberTypes[n], metadata.MemberInfos[n].Name, metadata.MemberInfos[n], null);
+					else if (BinaryCommon.IsPrimitive(metadata.MemberTypes[n])) {
+						// Since the member info is null, the type in this
+						// domain does not have this type. Even though we
+						// are not going to store the value, we will read
+						// it from the stream so that we can advance to the
+						// next block.
+						ReadPrimitiveTypeValue (reader,	metadata.MemberTypes[n]);
+					}
+				}
 		}
 
 		private void RegisterObject (long objectId, object objectInstance, SerializationInfo info, long parentObjectId, MemberInfo parentObjectMemeber, int[] indices)
diff --git a/mcs/class/corlib/Test/System.Runtime.Serialization.Formatters.Binary/VersionTolerantSerialization/BinarySerializationOverVersions.cs b/mcs/class/corlib/Test/System.Runtime.Serialization.Formatters.Binary/VersionTolerantSerialization/BinarySerializationOverVersions.cs
index fb4d9f3295d7..e8b89036c56b 100644
--- a/mcs/class/corlib/Test/System.Runtime.Serialization.Formatters.Binary/VersionTolerantSerialization/BinarySerializationOverVersions.cs
+++ b/mcs/class/corlib/Test/System.Runtime.Serialization.Formatters.Binary/VersionTolerantSerialization/BinarySerializationOverVersions.cs
@@ -124,6 +124,18 @@ public void TestDroppedFieldWithOptionalAttribAndData () //eliminate AreaCode
 			Deserialize ("4.0", Serialize ("5.0"));
 		}
 
+		[Test]
+		public void TestDroppedPrimitiveTypeField() //eliminate Id (int)
+		{
+			Deserialize ("5.0", Serialize ("6.0"));
+		}
+
+		[Test]
+		public void TestAddedPrimitiveTypeField () //add Id (int)
+		{
+			Deserialize ("6.0", Serialize ("5.0"));
+		}
+
 		private static string Serialize (string assemblyVersion)
 		{
 			return SerializeOOP (SetEnvironment (assemblyVersion)); ;
diff --git a/mcs/class/corlib/Test/System.Runtime.Serialization.Formatters.Binary/VersionTolerantSerialization/VersionTolerantSerializationTestLib/6.0/Address.cs b/mcs/class/corlib/Test/System.Runtime.Serialization.Formatters.Binary/VersionTolerantSerialization/VersionTolerantSerializationTestLib/6.0/Address.cs
new file mode 100644
index 000000000000..6b568a900b3d
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Runtime.Serialization.Formatters.Binary/VersionTolerantSerialization/VersionTolerantSerializationTestLib/6.0/Address.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace VersionTolerantSerializationTestLib
+{
+	[Serializable]
+	public class Address
+	{
+		private string Street;
+		private string City;
+		private string CountryCode;
+
+		[OptionalField (VersionAdded = 4)]
+		private string PostCode;
+
+		[OptionalField (VersionAdded = 5)]
+		private string AreaCode = "0";
+
+		[OptionalField (VersionAdded = 6)]
+		private int Id = 0;
+	}
+}