Check serializability of the whole type hierarchy

BadSingleton · BadSingleton · commit b409a892249f · 2020-09-10T13:03:28.000-04:00
When serializing wrapper objects on domain shutdown Addresses comment: #958 (comment)
diff --git a/src/runtime/runtime_data.cs b/src/runtime/runtime_data.cs
@@ -137,6 +137,19 @@ public static void ClearStash()
             PySys_SetObject("clr_data", IntPtr.Zero);
         }
 
+        static bool CheckSerializable (object o)
+        {
+            Type type = o.GetType();
+            do
+            {
+                if (!type.IsSerializable)
+                {
+                    return false;
+                }
+            } while ((type = type.BaseType) != null);
+            return true;
+        }
+
         private static void SaveRuntimeDataObjects(RuntimeDataStorage storage)
         {
             var objs = ManagedType.GetManagedObjects();
@@ -151,7 +164,7 @@ private static void SaveRuntimeDataObjects(RuntimeDataStorage storage)
                 switch (entry.Value)
                 {
                     case ManagedType.TrackTypes.Extension:
-                        Debug.Assert(obj.GetType().IsSerializable);
+                        Debug.Assert(CheckSerializable(obj));
                         var context = new InterDomainContext();
                         contexts[obj.pyHandle] = context;
                         obj.Save(context);
@@ -195,7 +208,7 @@ private static void SaveRuntimeDataObjects(RuntimeDataStorage storage)
             {
                 if (!item.Stored)
                 {
-                    if (!item.Instance.GetType().IsSerializable)
+                    if (!CheckSerializable(item.Instance))
                     {
                         continue;
                     }

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,19 @@ public static void ClearStash()`
`137`	`137`	`PySys_SetObject("clr_data", IntPtr.Zero);`
`138`	`138`	`}`
`139`	`139`
	`140`	`+ static bool CheckSerializable (object o)`
	`141`	`+ {`
	`142`	`+ Type type = o.GetType();`
	`143`	`+ do`
	`144`	`+ {`
	`145`	`+ if (!type.IsSerializable)`
	`146`	`+ {`
	`147`	`+ return false;`
	`148`	`+ }`
	`149`	`+ } while ((type = type.BaseType) != null);`
	`150`	`+ return true;`
	`151`	`+ }`
	`152`	`+`
`140`	`153`	`private static void SaveRuntimeDataObjects(RuntimeDataStorage storage)`
`141`	`154`	`{`
`142`	`155`	`var objs = ManagedType.GetManagedObjects();`
`@@ -151,7 +164,7 @@ private static void SaveRuntimeDataObjects(RuntimeDataStorage storage)`
`151`	`164`	`switch (entry.Value)`
`152`	`165`	`{`
`153`	`166`	`case ManagedType.TrackTypes.Extension:`
`154`		`- Debug.Assert(obj.GetType().IsSerializable);`
	`167`	`+ Debug.Assert(CheckSerializable(obj));`
`155`	`168`	`var context = new InterDomainContext();`
`156`	`169`	`contexts[obj.pyHandle] = context;`
`157`	`170`	`obj.Save(context);`
`@@ -195,7 +208,7 @@ private static void SaveRuntimeDataObjects(RuntimeDataStorage storage)`
`195`	`208`	`{`
`196`	`209`	`if (!item.Stored)`
`197`	`210`	`{`
`198`		`- if (!item.Instance.GetType().IsSerializable)`
	`211`	`+ if (!CheckSerializable(item.Instance))`
`199`	`212`	`{`
`200`	`213`	`continue;`
3AEE `201`	`214`	`}`