mirror of
https://github.com/SabreTools/SabreTools.IO.git
synced 2026-11-16 09:01:13 +00:00
Allow 0-byte reads at the end of a byte array (#3)
* Allow 0-byte reads at the end of a byte array ReadBytes(ref offset, 0) threw ArgumentOutOfRangeException when offset was equal to the array length, before the 0-byte case was handled. The same happened for a 0-byte read from an empty array, and TryReadBytes with a count of 0 at the end threw instead of returning true. The offset check now accepts the end of the array for a 0-byte read only; reads past the end still throw. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Handle 0-byte reads before the offset check Same order as the stream version of ReadExactlyToBuffer, applied to both byte array copies (Numerics.Extensions and IO.Extensions). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -782,10 +782,6 @@ namespace SabreTools.Numerics.Extensions
|
||||
/// </exception>
|
||||
private static byte[] ReadExactlyToBuffer(byte[] content, ref int offset, int length)
|
||||
{
|
||||
// If we have an invalid offset
|
||||
if (offset < 0 || offset >= content.Length)
|
||||
throw new ArgumentOutOfRangeException($"{nameof(offset)} must be between 0 and {content.Length}, {offset} provided");
|
||||
|
||||
// If we have an invalid length
|
||||
if (length < 0)
|
||||
throw new ArgumentOutOfRangeException($"{nameof(length)} must be 0 or a positive value, {length} requested");
|
||||
@@ -794,6 +790,10 @@ namespace SabreTools.Numerics.Extensions
|
||||
if (length == 0)
|
||||
return [];
|
||||
|
||||
// If we have an invalid offset
|
||||
if (offset < 0 || offset >= content.Length)
|
||||
throw new ArgumentOutOfRangeException($"{nameof(offset)} must be between 0 and {content.Length}, {offset} provided");
|
||||
|
||||
// If there are not enough bytes
|
||||
if (offset + length > content.Length)
|
||||
throw new System.IO.EndOfStreamException($"Requested to read {length} bytes from {nameof(content)}, {content.Length - offset} returned");
|
||||
|
||||
Reference in New Issue
Block a user