Skip to content

Fix prefix writing on TarHeaderWrite #75350

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
jozkee merged 5 commits into from
Sep 9, 2022
Merged

Fix prefix writing on TarHeaderWrite #75350

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
52c472f
Fix buffer too small error on prefix
jozkee Sep 9, 2022
862b3c4
Add test
jozkee Sep 9, 2022
95512e3
Remove var usage
jozkee Sep 9, 2022
e8983ba
Remove assert
jozkee Sep 9, 2022
de0c269
Update src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.Wri…
jozkee Sep 9, 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
Remove var usage
  • Loading branch information
@jozkee
jozkee committed Sep 9, 2022
commit 95512e3648e255c8308a647f61bd2adb71921b9e
23 changes: 12 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 @@ -323,27 +323,28 @@ private void WriteLongNameCore(TarEntryFormat format, string maxPathComponent)
{
Assert.Equal(255, maxPathComponent.Length);

var ms = new MemoryStream();
using (var writer = new TarWriter(ms, true))
TarEntry entry;
MemoryStream ms = new();
using (TarWriter writer = new(ms, true))
{
TarEntryType entryType = format == TarEntryFormat.V7 ? TarEntryType.V7RegularFile : TarEntryType.RegularFile;
var entry1 = InvokeTarEntryCreationConstructor(format, entryType, maxPathComponent);
writer.WriteEntry(entry1);
entry = InvokeTarEntryCreationConstructor(format, entryType, maxPathComponent);
writer.WriteEntry(entry);

var entry2 = InvokeTarEntryCreationConstructor(format, entryType, Path.Join(maxPathComponent, maxPathComponent));
writer.WriteEntry(entry2);
entry = InvokeTarEntryCreationConstructor(format, entryType, Path.Join(maxPathComponent, maxPathComponent));
writer.WriteEntry(entry);
}

ms.Position = 0;
using var reader = new TarReader(ms);
using TarReader reader = new(ms);

TarEntry readEntry = reader.GetNextEntry();
entry = reader.GetNextEntry();
string expectedName = GetExpectedNameForFormat(format, maxPathComponent);
Assert.Equal(expectedName, readEntry.Name);
Assert.Equal(expectedName, entry.Name);

readEntry = reader.GetNextEntry();
entry = reader.GetNextEntry();
expectedName = GetExpectedNameForFormat(format, Path.Join(maxPathComponent, maxPathComponent));
Assert.Equal(expectedName, readEntry.Name);
Assert.Equal(expectedName, entry.Name);

Assert.Null(reader.GetNextEntry());

Expand Down