In System:

[mono.git] / mcs / class / corlib / System / RuntimeTypeHandle.cs

diff --git a/mcs/class/corlib/System/RuntimeTypeHandle.cs b/mcs/class/corlib/System/RuntimeTypeHandle.cs
index f4f8721541d8046ccd0c19d1459e1ed6df27a45b..20c0cf9b448df0ed41f2b628c972b244ed3e43c9 100644 (file)
--- a/mcs/class/corlib/System/RuntimeTypeHandle.cs
+++ b/mcs/class/corlib/System/RuntimeTypeHandle.cs
@@ -76,6 +76,9 @@ namespace System
                        if (info == null)
                                throw new ArgumentNullException ("info");
 
+                       if (value == IntPtr.Zero)
+                               throw new SerializationException ("Object fields may not be properly initialized");
+
                        info.AddValue ("TypeObj", Type.GetTypeHandle (this), typeof (MonoType));
                }
 
@@ -122,7 +125,14 @@ namespace System
 
                [CLSCompliant (false)]
                [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
-               public ModuleHandle GetModuleHandle () {
+               public ModuleHandle GetModuleHandle ()
+               {
+                       // Although MS' runtime is crashing here, we prefer throwing an exception.
+                       // The check is needed because Type.GetTypeFromHandle returns null
+                       // for zero handles.
+                       if (value == IntPtr.Zero)
+                               throw new InvalidOperationException ("Object fields may not be properly initialized");
+
                        return Type.GetTypeFromHandle (this).Module.ModuleHandle;
                }
 #endif