fix(Hash): 修复 CrcHelper 异常处理问题

AlianBlank · AlianBlank · commit b0e355ae437b · 2026-03-13T18:38:42.000+08:00
- CrcHelper.Crc64.cs: 在调用点直接抛出 ArgumentException，使用 nameof(destination)
- CrcHelper.cs: 统一使用 ArgumentNullException.ThrowIfNull 替代旧构造方式
diff --git a/GameFrameX.Foundation.Hash/CrcHelper.Crc64.cs b/GameFrameX.Foundation.Hash/CrcHelper.Crc64.cs
@@ -220,7 +220,7 @@ public static int Hash(ReadOnlySpan<byte> source, Span<byte> destination)
         {
             if (destination.Length < Size)
             {
-                ThrowDestinationTooShort();
+                throw new ArgumentException("Destination buffer is too short.", nameof(destination));
             }
 
             var hash = HashToUInt64(source);
@@ -469,7 +469,7 @@ public int GetCurrentHash(Span<byte> destination)
         {
             if (destination.Length < HashLengthInBytes)
             {
-                ThrowDestinationTooShort();
+                throw new ArgumentException("Destination buffer is too short.", nameof(destination));
             }
 
             GetCurrentHashCore(destination.Slice(0, HashLengthInBytes));
@@ -531,7 +531,7 @@ public int GetHashAndReset(Span<byte> destination)
         {
             if (destination.Length < HashLengthInBytes)
             {
-                ThrowDestinationTooShort();
+                throw new ArgumentException("Destination buffer is too short.", nameof(destination));
             }
 
             GetHashAndResetCore(destination.Slice(0, HashLengthInBytes));
@@ -582,11 +582,5 @@ public override int GetHashCode()
         {
             throw new NotSupportedException();
         }
-
-
-        private protected static void ThrowDestinationTooShort()
-        {
-            throw new ArgumentException("destination");
-        }
     }
 }
diff --git a/GameFrameX.Foundation.Hash/CrcHelper.cs b/GameFrameX.Foundation.Hash/CrcHelper.cs
@@ -67,10 +67,7 @@ public static ulong GetCrc64(Stream stream)
     /// <exception cref="ArgumentNullException">当bytes参数为null时抛出</exception>
     public static int GetCrc32(byte[] bytes)
     {
-        if (bytes == null)
-        {
-            throw new ArgumentNullException(nameof(bytes), @"Bytes is invalid.");
-        }
+        ArgumentNullException.ThrowIfNull(bytes, nameof(bytes));
 
         return GetCrc32(bytes, 0, bytes.Length);
     }
@@ -86,10 +83,7 @@ public static int GetCrc32(byte[] bytes)
     /// <exception cref="ArgumentException">当offset或length参数无效时抛出</exception>
     public static int GetCrc32(byte[] bytes, int offset, int length)
     {
-        if (bytes == null)
-        {
-            throw new ArgumentNullException(nameof(bytes), @"Bytes is invalid.");
-        }
+        ArgumentNullException.ThrowIfNull(bytes, nameof(bytes));
 
         if (offset < 0 || length < 0 || offset + length > bytes.Length)
         {
@@ -110,10 +104,7 @@ public static int GetCrc32(byte[] bytes, int offset, int length)
     /// <exception cref="ArgumentNullException">当stream参数为null时抛出</exception>
     public static int GetCrc32(Stream stream)
     {
-        if (stream == null)
-        {
-            throw new ArgumentNullException(nameof(stream), @"Stream is invalid.");
-        }
+        ArgumentNullException.ThrowIfNull(stream, nameof(stream));
 
         while (true)
         {

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ public static int Hash(ReadOnlySpan<byte> source, Span<byte> destination)`
`220`	`220`	`{`
`221`	`221`	`if (destination.Length < Size)`
`222`	`222`	`{`
`223`		`- ThrowDestinationTooShort();`
	`223`	`+ throw new ArgumentException("Destination buffer is too short.", nameof(destination));`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`var hash = HashToUInt64(source);`
`@@ -469,7 +469,7 @@ public int GetCurrentHash(Span<byte> destination)`
`469`	`469`	`{`
`470`	`470`	`if (destination.Length < HashLengthInBytes)`
`471`	`471`	`{`
`472`		`- ThrowDestinationTooShort();`
	`472`	`+ throw new ArgumentException("Destination buffer is too short.", nameof(destination));`
`473`	`473`	`}`
`474`	`474`
`475`	`475`	`GetCurrentHashCore(destination.Slice(0, HashLengthInBytes));`
`@@ -531,7 +531,7 @@ public int GetHashAndReset(Span<byte> destination)`
`531`	`531`	`{`
`532`	`532`	`if (destination.Length < HashLengthInBytes)`
`533`	`533`	`{`
`534`		`- ThrowDestinationTooShort();`
	`534`	`+ throw new ArgumentException("Destination buffer is too short.", nameof(destination));`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`GetHashAndResetCore(destination.Slice(0, HashLengthInBytes));`
`@@ -582,11 +582,5 @@ public override int GetHashCode()`
`582`	`582`	`{`
`583`	`583`	`throw new NotSupportedException();`
`584`	`584`	`}`
`585`		`-`
`586`		`-`
`587`		`- private protected static void ThrowDestinationTooShort()`
`588`		`- {`
`589`		`- throw new ArgumentException("destination");`
`590`		`- }`
`591`	`585`	`}`
`592`	`586`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,7 @@ public static ulong GetCrc64(Stream stream)`
`67`	`67`	`/// <exception cref="ArgumentNullException">当bytes参数为null时抛出</exception>`
`68`	`68`	`public static int GetCrc32(byte[] bytes)`
`69`	`69`	`{`
`70`		`- if (bytes == null)`
`71`		`- {`
`72`		`- throw new ArgumentNullException(nameof(bytes), @"Bytes is invalid.");`
`73`		`- }`
	`70`	`+ ArgumentNullException.ThrowIfNull(bytes, nameof(bytes));`
`74`	`71`
`75`	`72`	`return GetCrc32(bytes, 0, bytes.Length);`
`76`	`73`	`}`
`@@ -86,10 +83,7 @@ public static int GetCrc32(byte[] bytes)`
`86`	`83`	`/// <exception cref="ArgumentException">当offset或length参数无效时抛出</exception>`
`87`	`84`	`public static int GetCrc32(byte[] bytes, int offset, int length)`
`88`	`85`	`{`
`89`		`- if (bytes == null)`
`90`		`- {`
`91`		`- throw new ArgumentNullException(nameof(bytes), @"Bytes is invalid.");`
`92`		`- }`
	`86`	`+ ArgumentNullException.ThrowIfNull(bytes, nameof(bytes));`
`93`	`87`
`94`	`88`	`if (offset < 0 \|\| length < 0 \|\| offset + length > bytes.Length)`
`95`	`89`	`{`
`@@ -110,10 +104,7 @@ public static int GetCrc32(byte[] bytes, int offset, int length)`
`110`	`104`	`/// <exception cref="ArgumentNullException">当stream参数为null时抛出</exception>`
`111`	`105`	`public static int GetCrc32(Stream stream)`
`112`	`106`	`{`
`113`		`- if (stream == null)`
`114`		`- {`
`115`		`- throw new ArgumentNullException(nameof(stream), @"Stream is invalid.");`
`116`		`- }`
	`107`	`+ ArgumentNullException.ThrowIfNull(stream, nameof(stream));`
`117`	`108`
`118`	`109`	`while (true)`
`119`	`110`	`{`