starred/sharpcompress
1
0
Fork 0
mirror of https://github.com/adamhathcock/sharpcompress.git synced 2026-11-15 17:02:03 +00:00
Code Issues 975 Packages Projects Releases 25 Wiki Activity

Read ARC entry headers fully on fragmented streams

Browse Source
This commit is contained in:
Adam Hathcock
2026-10-10 15:40:35 +01:00
parent b442327e5f
commit 2a68ec7257
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/SharpCompress/Common/Arc/ArcEntryHeader.cs
View File

@@ -26,7 +26,7 @@ public class ArcEntryHeader
public ArcEntryHeader? ReadHeader(Stream stream)
{
byte[] headerBytes = new byte[29];
if (stream.Read(headerBytes, 0, headerBytes.Length) != headerBytes.Length)
if (!stream.ReadFully(headerBytes))
{
return null;
}
@@ -40,11 +40,7 @@ public class ArcEntryHeader
)
{
byte[] headerBytes = new byte[29];
if (
await stream
.ReadAsync(headerBytes, 0, headerBytes.Length, cancellationToken)
.ConfigureAwait(false) != headerBytes.Length
)
if (!await stream.ReadFullyAsync(headerBytes, cancellationToken).ConfigureAwait(false))
{
return null;
}

26
tests/SharpCompress.Test/Arc/ArcHeaderReadTests.cs Normal file
View File

@@ -0,0 +1,26 @@
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using SharpCompress.Common;
using SharpCompress.Common.Arc;
using SharpCompress.Test.Mocks;
using Xunit;
namespace SharpCompress.Test.Arc;
public class ArcHeaderReadTests
{
[Fact]
public async Task Arc_Header_Allows_Partial_Reads()
{
var header = new byte[29];
header[0] = 0x1A;
header[1] = 2;
header[2] = (byte)'x';
using var sync = new ShortReadStream(new MemoryStream(header));
using var asyncInput = new ShortReadStream(new MemoryStream(header));
var parser = new ArcEntryHeader(new ArchiveEncoding());
Assert.Equal("x", parser.ReadHeader(sync)!.Name);
Assert.Equal("x", (await parser.ReadHeaderAsync(asyncInput, CancellationToken.None))!.Name);
}
}