+2008-05-07 Robert Jordan <robertj@gmx.net>
+
+ * corlib_test.dll.sources: Add System/Runtime*HandleTest.cs
+
2008-05-07 Sebastien Pouliot <sebastien@ximian.com>
* corlib.dll.sources: Remove System.IO/Check[Argument|Permission].cs
+2008-05-07 Robert Jordan <robertj@gmx.net>
+
+ * RuntimeFieldHandle.cs, RuntimeTypeHandle.cs, RuntimeMethodHandle.cs:
+ Don't try to serialize uninitialized handles. Fixes #386641.
+
2008-05-06 Marek Safar <marek.safar@gmail.com>
* IntPtr.cs (eplicit long, GetObjectData): Use ToInt64.
if (info == null)
throw new ArgumentNullException ("info");
+ if (value == IntPtr.Zero)
+ throw new SerializationException ("Object fields may not be properly initialized");
+
info.AddValue ("FieldObj", (MonoField) FieldInfo.GetFieldFromHandle (this), typeof (MonoField));
}
if (info == null)
throw new ArgumentNullException ("info");
+ if (value == IntPtr.Zero)
+ throw new SerializationException ("Object fields may not be properly initialized");
+
info.AddValue ("MethodObj", (MonoMethod) MethodBase.GetMethodFromHandle (this), typeof (MonoMethod));
}
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));
}
[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
+2008-05-07 Robert Jordan <robertj@gmx.net>
+
+ * Runtime*Handle.cs: Add serialization tests.
+
2008-05-02 Atsushi Enomoto <atsushi@ximian.com>
* ConvertTest.cs : added test for Convert.FromBase64String()
--- /dev/null
+//
+// RuntimeFieldHandleTest.cs - Unit tests for System.RuntimeFieldHandle
+//
+// Author:
+// Robert Jordan <robertj@gmx.net>
+//
+// Copyright (C) 2008 Novell, Inc. (http://www.novell.com)
+//
+// 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.
+//
+
+using System;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
+
+using NUnit.Framework;
+
+namespace MonoTests.System
+{
+ [TestFixture]
+ public class RuntimeFieldHandleTest
+ {
+ [Test]
+ [ExpectedException (typeof (SerializationException))]
+ public void Serialization_Of_Empty_Handle ()
+ {
+ RuntimeFieldHandle handle = new RuntimeFieldHandle ();
+ new BinaryFormatter ().Serialize (Stream.Null, handle);
+ }
+ }
+}
//
using System;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
using NUnit.Framework;
Assert.IsTrue (rmhB1 != rmhA1, "#B6");
}
#endif
+
+ [Test]
+ [ExpectedException (typeof (SerializationException))]
+ public void Serialization_Of_Empty_Handle ()
+ {
+ RuntimeMethodHandle handle = new RuntimeMethodHandle ();
+ new BinaryFormatter ().Serialize (Stream.Null, handle);
+ }
}
}
--- /dev/null
+//
+// RuntimeTypeHandleTest.cs - Unit tests for System.RuntimeTypeHandle
+//
+// Author:
+// Robert Jordan <robertj@gmx.net>
+//
+// Copyright (C) 2008 Novell, Inc. (http://www.novell.com)
+//
+// 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.
+//
+
+using System;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
+
+using NUnit.Framework;
+
+namespace MonoTests.System
+{
+ [TestFixture]
+ public class RuntimeTypeHandleTest
+ {
+ [Test]
+ [ExpectedException (typeof (SerializationException))]
+ public void Serialization_Of_Empty_Handle ()
+ {
+ RuntimeTypeHandle handle = new RuntimeTypeHandle ();
+ new BinaryFormatter ().Serialize (Stream.Null, handle);
+ }
+
+#if NET_2_0
+ [Test]
+ [ExpectedException (typeof (InvalidOperationException))]
+ [Category ("NotDotNet")] // it crashes the runtime on MS.NET
+ public void GetModuleHandle_Of_Empty_Handle ()
+ {
+ RuntimeTypeHandle handle = new RuntimeTypeHandle ();
+ handle.GetModuleHandle ();
+ }
+#endif
+ }
+}
System/EnvironmentCas.cs
System/ExceptionCas.cs
System/MarshalByRefObjectCas.cs
+System/RuntimeFieldHandleTest.cs
System/RuntimeMethodHandleCas.cs
System/RuntimeMethodHandleTest.cs
+System/RuntimeTypeHandleTest.cs
System/TypedReferenceCas.cs
System.Diagnostics/StackFrameCas.cs
System.Diagnostics/StackTraceCas.cs
projects / mono.git / commitdiff