starred/sharpcompress
1
0
Fork 0
mirror of https://github.com/adamhathcock/sharpcompress.git synced 2026-09-23 23:45:14 +00:00
Code Issues 975 Packages Projects Releases 25 Wiki Activity

Some tar fixes from review

Browse Source
This commit is contained in:
Adam Hathcock
2026-05-15 12:20:53 +01:00
parent 9d87274c5a
commit a7d5949604
2 changed files with 48 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
src/SharpCompress/Common/Tar/Headers/TarHeader.Async.cs
View File

@@ -207,50 +207,52 @@ internal sealed partial class TarHeader
{
globalPaxMetadata ??= new PaxMetadata();
var pendingMetadata = globalPaxMetadata.Clone();
byte[] buffer;
var buffer = ArrayPool<byte>.Shared.Rent(BLOCK_SIZE);
EntryType entryType;
while (true)
try
{
buffer = await ReadBlockAsync(reader).ConfigureAwait(false);
if (buffer.Length == 0)
while (true)
{
return false;
await reader.ReadBytesAsync(buffer, 0, BLOCK_SIZE).ConfigureAwait(false);
entryType = ReadEntryType(buffer);
// LongName and LongLink headers can follow each other and need
// to apply to the header that follows them.
if (entryType == EntryType.LongName)
{
pendingMetadata.Name = await ReadLongNameAsync(reader, buffer)
.ConfigureAwait(false);
continue;
}
if (entryType == EntryType.LongLink)
{
pendingMetadata.LinkName = await ReadLongNameAsync(reader, buffer)
.ConfigureAwait(false);
continue;
}
if (entryType == EntryType.LocalExtendedHeader)
{
await ReadPaxMetadataAsync(reader, buffer, pendingMetadata)
.ConfigureAwait(false);
continue;
}
if (entryType == EntryType.GlobalExtendedHeader)
{
await ReadPaxMetadataAsync(reader, buffer, globalPaxMetadata)
.ConfigureAwait(false);
pendingMetadata = globalPaxMetadata.Clone();
continue;
}
break;
}
entryType = ReadEntryType(buffer);
// LongName and LongLink headers can follow each other and need
// to apply to the header that follows them.
if (entryType == EntryType.LongName)
{
pendingMetadata.Name = await ReadLongNameAsync(reader, buffer)
.ConfigureAwait(false);
continue;
}
if (entryType == EntryType.LongLink)
{
pendingMetadata.LinkName = await ReadLongNameAsync(reader, buffer)
.ConfigureAwait(false);
continue;
}
if (entryType == EntryType.LocalExtendedHeader)
{
await ReadPaxMetadataAsync(reader, buffer, pendingMetadata).ConfigureAwait(false);
continue;
}
if (entryType == EntryType.GlobalExtendedHeader)
{
await ReadPaxMetadataAsync(reader, buffer, globalPaxMetadata).ConfigureAwait(false);
pendingMetadata = globalPaxMetadata.Clone();
continue;
}
break;
}
finally
{
ArrayPool<byte>.Shared.Return(buffer);
}
// Check header checksum
@@ -304,19 +306,12 @@ internal sealed partial class TarHeader
return true;
}
private static async ValueTask<byte[]> ReadBlockAsync(AsyncBinaryReader reader)
private static async ValueTask ReadLengthAsync(AsyncBinaryReader reader, int length)
{
var buffer = ArrayPool<byte>.Shared.Rent(BLOCK_SIZE);
var buffer = ArrayPool<byte>.Shared.Rent(length);
try
{
await reader.ReadBytesAsync(buffer, 0, BLOCK_SIZE).ConfigureAwait(false);
if (buffer.Length != 0 && buffer.Length < BLOCK_SIZE)
{
throw new InvalidFormatException("Buffer is invalid size");
}
return buffer;
await reader.ReadBytesAsync(buffer, 0, length).ConfigureAwait(false);
}
finally
{
@@ -378,8 +373,7 @@ internal sealed partial class TarHeader
var paddingLength = GetPaddingLength(payloadLength);
if (paddingLength > 0)
{
var padding = new byte[paddingLength];
await reader.ReadBytesAsync(padding, 0, paddingLength).ConfigureAwait(false);
await ReadLengthAsync(reader, paddingLength).ConfigureAwait(false);
}
return payload;

4
src/SharpCompress/Common/Tar/Headers/TarHeader.cs
View File

@@ -469,14 +469,14 @@ internal sealed partial class TarHeader
}
var recordLength = ParsePaxRecordLength(payload, index, spaceIndex - index);
var recordEnd = index + recordLength;
if (recordEnd > payload.Length)
if (recordLength <= 0 || recordLength > payload.Length - index)
{
throw new InvalidFormatException(
"Invalid PAX record: record length exceeds payload."
);
}
var recordEnd = index + recordLength;
if (payload[recordEnd - 1] != (byte)'\n')
{
throw new InvalidFormatException(