Add a safeguard during serialization

BadSingleton · BadSingleton · commit efabeba6e3ed · 2020-09-23T14:39:25.000-04:00
diff --git a/src/runtime/runtime_data.cs b/src/runtime/runtime_data.cs
@@ -89,22 +89,37 @@ internal static void Stash()
 
             IFormatter formatter = CreateFormatter();
             var ms = new MemoryStream();
-            trace("serialization start");
-            formatter.Serialize(ms, runtimeStorage);
-            trace("serialization done");
-
-            Debug.Assert(ms.Length <= int.MaxValue);
-            byte[] data = ms.GetBuffer();
-            // TODO: use buffer api instead
-            IntPtr mem = PyMem_Malloc(ms.Length + IntPtr.Size);
-            Marshal.WriteIntPtr(mem, (IntPtr)ms.Length);
-            Marshal.Copy(data, 0, mem + IntPtr.Size, (int)ms.Length);
-
-            ClearCLRData();
-            IntPtr capsule = PyCapsule_New(mem, null, IntPtr.Zero);
-            PySys_SetObject("clr_data", capsule);
-            // Let the dictionary own the reference
-            XDecref(capsule);
+            IntPtr capsule = IntPtr.Zero;
+            try
+            {
+                trace("serialization start");
+                formatter.Serialize(ms, runtimeStorage);
+                trace("serialization done");
+
+                Debug.Assert(ms.Length <= int.MaxValue);
+                byte[] data = ms.GetBuffer();
+                // TODO: use buffer api instead
+                IntPtr mem = PyMem_Malloc(ms.Length + IntPtr.Size);
+                Marshal.WriteIntPtr(mem, (IntPtr)ms.Length);
+                Marshal.Copy(data, 0, mem + IntPtr.Size, (int)ms.Length);
+
+                ClearCLRData();
+                capsule = PyCapsule_New(mem, null, IntPtr.Zero);
+                PySys_SetObject("clr_data", capsule);
+                
+            }
+            catch(Exception e)
+            {
+                trace($"Serialization failed! No runtime data will be saved. \n {e.Message} :: {e.StackTrace}");
+            }
+            finally
+            {
+                if (capsule != IntPtr.Zero)
+                {
+                    // Let the dictionary own the reference
+                    XDecref(capsule);
+                }
+            }
         }
 
         internal static void RestoreRuntimeData()
