Skip to content

[release/7.0] Fix prefix writing on TarHeaderWrite #75373

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 7 commits into from
Sep 14, 2022
Merged

[release/7.0] Fix prefix writing on TarHeaderWrite #75373

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
64af359
Fix buffer too small error on prefix
jozkee Sep 9, 2022
bac54fa
Add test
jozkee Sep 9, 2022
63b9158
Remove var usage
jozkee Sep 9, 2022
7c407ee
Remove assert
jozkee Sep 9, 2022
04d14e5
Update src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.Wri…
jozkee Sep 9, 2022
a2d1aa5
Add more lengths and improve test
jozkee Sep 12, 2022
fe1d82e
Add missing using
jozkee Sep 12, 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
Add more lengths and improve test
  • Loading branch information
@jozkee
jozkee authored Sep 12, 2022
commit a2d1aa5c1ba95edec2f6f0fa5caa5e5836451f79
18 changes: 7 additions & 11 deletions src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,20 +307,16 @@ public void WriteTimestampsBeyondOctalLimit(TarEntryFormat format)
[InlineData(TarEntryFormat.Gnu)]
public void WriteLongName(TarEntryFormat format)
{
string maxPathComponent = new string('a', 255);
WriteLongNameCore(format, maxPathComponent);

maxPathComponent = new string('a', 90) + new string('b', 165);
WriteLongNameCore(format, maxPathComponent);

maxPathComponent = new string('a', 165) + new string('b', 90);
WriteLongNameCore(format, maxPathComponent);
var r = new Random();
Copy link
Member

@stephentoub stephentoub Sep 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally this would have a seed. That way the test is reproducible.

Suggested change
var r = new Random();
var r = new Random(42);

Copy link
Contributor

@carlossanlop carlossanlop Sep 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Glad you used 42. It's the answer to life, the universe, and everything. 😃

foreach (int length in new[] { 99, 100, 101, 199, 200, 201, 254, 255, 256 })
{
string name = string.Concat(Enumerable.Range(0, length).Select(_ => (char)('a' + r.Next(26))));
WriteLongNameCore(format, name);
}
}

private void WriteLongNameCore(TarEntryFormat format, string maxPathComponent)
{
Assert.Equal(255, maxPathComponent.Length);

TarEntry entry;
MemoryStream ms = new();
using (TarWriter writer = new(ms, true))
Copy link
Member

@stephentoub stephentoub Sep 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
using (TarWriter writer = new(ms, true))
using (TarWriter writer = new(ms, leaveOpen: true))

Expand Down Expand Up @@ -348,7 +344,7 @@ private void WriteLongNameCore(TarEntryFormat format, string maxPathComponent)

string GetExpectedNameForFormat(TarEntryFormat format, string expectedName)
{
if (format is TarEntryFormat.V7) // V7 truncates names at 100 characters.
if (format is TarEntryFormat.V7 && expectedName.Length > 100) // V7 truncates names at 100 characters.
{
return expectedName.Substring(0, 100);
}
Expand Down