Skip to content

Add tests for exotic external tar asset archives, fix some more corner case bugs #74412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlossanlop merged 10 commits into from
Aug 23, 2022
Merged

Add tests for exotic external tar asset archives, fix some more corner case bugs #74412

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6dc5425
Remove unused _readFirstEntry. Remnant from before we created PaxGlob…
carlossanlop Aug 23, 2022
2da41d1
Set the position of the freshly copied data stream to 0, so the first…
carlossanlop Aug 23, 2022
264fc18
Process a PAX actual entry's data block only after the extended attri…
carlossanlop Aug 23, 2022
d7ce734
Add tests to verify the entries of the new external tar assets can be…
carlossanlop Aug 23, 2022
f06a4c1
Add copyData argument to recent alignment padding tests.
carlossanlop Aug 23, 2022
9e83b4c
Throw an exception sooner and with a clearer message when a data sect…
carlossanlop Aug 23, 2022
121d20a
Allow trailing nulls and spaces in octal fields.
carlossanlop Aug 23, 2022
33d2461
Throw a clearer exception if the unsupported sparse file entry type i…
carlossanlop Aug 23, 2022
457cf2d
Tests.
carlossanlop Aug 23, 2022
37a3511
Rename to TrimLeadingNullsAndSpaces
carlossanlop Aug 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Throw an exception sooner and with a clearer message when a data sect… 
…ion is unexpected for the entry type.
  • Loading branch information
@carlossanlop
carlossanlop committed Aug 23, 2022
commit 9e83b4c861a6ab11b47bc37f1e4caa5f28c98179
8 changes: 8 additions & 0 deletions src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarHeader.Read.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,10 @@ internal void ProcessDataBlock(Stream archiveStream, bool copyData)
case TarEntryType.HardLink:
case TarEntryType.SymbolicLink:
// No data section
if (_size > 0)
{
throw new FormatException(string.Format(SR.TarSizeFieldTooLargeForEntryType, _typeFlag));
}
break;
case TarEntryType.RegularFile:
case TarEntryType.V7RegularFile: // Treated as regular file
Expand Down Expand Up @@ -257,6 +261,10 @@ private async Task ProcessDataBlockAsync(Stream archiveStream, bool copyData, Ca
case TarEntryType.HardLink:
case TarEntryType.SymbolicLink:
// No data section
if (_size > 0)
{
throw new FormatException(string.Format(SR.TarSizeFieldTooLargeForEntryType, _typeFlag));
}
break;
case TarEntryType.RegularFile:
case TarEntryType.V7RegularFile: // Treated as regular file
Expand Down