Use ArgumentValidator instead of custom arg validation logic

Author: jstedfast

MimeKit/Encodings/Base64Validator.cs

@@ -75,19 +75,6 @@ public ContentEncoding Encoding {
 			get { return ContentEncoding.Base64; }
 		}
 
-		[MethodImpl (MethodImplOptions.AggressiveInlining)]
-		static void ValidateArguments (byte[] input, int startIndex, int length)
-		{
-			if (input is null)
-				throw new ArgumentNullException (nameof (input));
-
-			if (startIndex < 0 || startIndex > input.Length)
-				throw new ArgumentOutOfRangeException (nameof (startIndex));
-
-			if (length < 0 || length > (input.Length - startIndex))
-				throw new ArgumentOutOfRangeException (nameof (length));
-		}
-
 #if NET6_0_OR_GREATER
 		[SkipLocalsInit]
 #endif
@@ -182,7 +169,7 @@ unsafe void Validate (ref byte table, byte* input, int length)
 		/// </exception>
 		public unsafe void Write (byte[] buffer, int startIndex, int length)
 		{
-			ValidateArguments (buffer, startIndex, length);
+			ArgumentValidator.Validate (buffer, startIndex, length);
 
 			if (invalid)
 				return;

MimeKit/Encodings/QuotedPrintableValidator.cs

@@ -80,19 +80,6 @@ public ContentEncoding Encoding {
 			get { return ContentEncoding.QuotedPrintable; }
 		}
 
-		[MethodImpl (MethodImplOptions.AggressiveInlining)]
-		static void ValidateArguments (byte[] input, int startIndex, int length)
-		{
-			if (input is null)
-				throw new ArgumentNullException (nameof (input));
-
-			if (startIndex < 0 || startIndex > input.Length)
-				throw new ArgumentOutOfRangeException (nameof (startIndex));
-
-			if (length < 0 || length > (input.Length - startIndex))
-				throw new ArgumentOutOfRangeException (nameof (length));
-		}
-
 #if NET6_0_OR_GREATER
 		[SkipLocalsInit]
 #endif
@@ -181,7 +168,7 @@ unsafe void Validate (byte* input, int length)
 		/// </exception>
 		public unsafe void Write (byte[] buffer, int startIndex, int length)
 		{
-			ValidateArguments (buffer, startIndex, length);
+			ArgumentValidator.Validate (buffer, startIndex, length);
 
 			fixed (byte* inbuf = buffer) {
 				Validate (inbuf + startIndex, length);

MimeKit/Encodings/UUValidator.cs

@@ -98,19 +98,6 @@ public ContentEncoding Encoding {
 			get { return ContentEncoding.UUEncode; }
 		}
 
-		[MethodImpl (MethodImplOptions.AggressiveInlining)]
-		static void ValidateArguments (byte[] input, int startIndex, int length)
-		{
-			if (input is null)
-				throw new ArgumentNullException (nameof (input));
-
-			if (startIndex < 0 || startIndex > input.Length)
-				throw new ArgumentOutOfRangeException (nameof (startIndex));
-
-			if (length < 0 || length > (input.Length - startIndex))
-				throw new ArgumentOutOfRangeException (nameof (length));
-		}
-
 		[MethodImpl (MethodImplOptions.AggressiveInlining)]
 		unsafe byte ReadByte (ref byte* inptr)
 		{
@@ -495,7 +482,7 @@ unsafe void Validate (byte* input, int length)
 		/// </exception>
 		public unsafe void Write (byte[] buffer, int startIndex, int length)
 		{
-			ValidateArguments (buffer, startIndex, length);
+			ArgumentValidator.Validate (buffer, startIndex, length);
 
 			if (state == UUValidatorState.Invalid)
 				return;