Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -374,12 +374,9 @@ private int WritePosixName(Span<byte> buffer)

if (_name.Length > FieldLengths.Name)
{
int prefixBytesLength = Math.Min(_name.Length - FieldLengths.Name, FieldLengths.Name);
Span<byte> remaining = prefixBytesLength <= 256 ?
stackalloc byte[prefixBytesLength] :
new byte[prefixBytesLength];

int encoded = Encoding.ASCII.GetBytes(_name.AsSpan(FieldLengths.Name), remaining);
int prefixBytesLength = Math.Min(_name.Length - FieldLengths.Name, FieldLengths.Prefix);
Span<byte> remaining = stackalloc byte[prefixBytesLength];
int encoded = Encoding.ASCII.GetBytes(_name.AsSpan(FieldLengths.Name, prefixBytesLength), remaining);
Debug.Assert(encoded == remaining.Length);

checksum += WriteLeftAlignedBytesAndGetChecksum(remaining, buffer.Slice(FieldLocations.Prefix, FieldLengths.Prefix));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -299,5 +299,61 @@ public void WriteTimestampsBeyondOctalLimit(TarEntryFormat format)
}
}
}

[Theory]
[InlineData(TarEntryFormat.V7)]
// [InlineData(TarEntryFormat.Ustar)] https://github.com/dotnet/runtime/issues/75360
[InlineData(TarEntryFormat.Pax)]
[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);
}

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

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))

{
TarEntryType entryType = format == TarEntryFormat.V7 ? TarEntryType.V7RegularFile : TarEntryType.RegularFile;
entry = InvokeTarEntryCreationConstructor(format, entryType, maxPathComponent);
writer.WriteEntry(entry);

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

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

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

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

Assert.Null(reader.GetNextEntry());

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