argument checking

Author: jbevain

Mono.Reflection/ILPattern.cs

@@ -164,6 +164,11 @@ public bool TryMatch (MatchContext context)
 
 		public static MatchContext Match (MethodBase method, ILPattern pattern)
 		{
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (pattern == null)
+				throw new ArgumentNullException ("pattern");
+
 			var instructions = method.GetInstructions ();
 			if (instructions.Count == 0)
 				throw new ArgumentException ();
@@ -174,7 +179,7 @@ public static MatchContext Match (MethodBase method, ILPattern pattern)
 		}
 	}
 
-	public class MatchContext {
+	public sealed class MatchContext {
 
 		internal Instruction instruction;
 		internal bool success;
@@ -186,7 +191,7 @@ public bool IsMatch {
 			set { success = true; }
 		}
 
-		public MatchContext (Instruction instruction)
+		internal MatchContext (Instruction instruction)
 		{
 			Reset (instruction);
 		}

Mono.Reflection/Image.cs

@@ -31,7 +31,7 @@
 
 namespace Mono.Reflection {
 
-	public class Image : IDisposable {
+	public sealed class Image : IDisposable {
 
 		long position;
 		Stream stream;
@@ -102,14 +102,25 @@ bool IsManagedAssembly ()
 
 		public static bool IsAssembly (string file)
 		{
+			if (file == null)
+				throw new ArgumentNullException ("file");
+
 			using (var stream = new FileStream (file, FileMode.Open, FileAccess.Read, FileShare.Read))
 				return IsAssembly (stream);
 		}
 
 		public static bool IsAssembly (Stream stream)
 		{
+			if (stream == null)
+				throw new ArgumentNullException ("stream");
+			if (!stream.CanRead)
+				throw new ArgumentException ("Can not read from stream");
+			if (!stream.CanSeek)
+				throw new ArgumentException ("Can not seek in stream");
+
 			using (var image = new Image (stream))
 				return image.IsManagedAssembly ();
 		}
 	}
 }
+	

Mono.Reflection/MethodBodyReader.cs

@@ -74,11 +74,11 @@ static MethodBodyReader ()
 
 			this.body = method.GetMethodBody ();
 			if (this.body == null)
-				throw new ArgumentException ();
+				throw new ArgumentException ("Method has no body");
 
 			var bytes = body.GetILAsByteArray ();
 			if (bytes == null)
-				throw new ArgumentException ();
+				throw new ArgumentException ("Can not get the body of the method");
 
 			if (!(method is ConstructorInfo))
 				method_arguments = method.GetGenericArguments ();