Skip to content

fix(tar): read full extended headers #675

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
piksel merged 2 commits into from
Aug 14, 2022
Merged

fix(tar): read full extended headers #675

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bbec34
fix(tar): read full extended headers
piksel Oct 10, 2021
218b219
Update src/ICSharpCode.SharpZipLib/Tar/TarExtendedHeaderReader.cs
piksel Aug 14, 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
37 changes: 32 additions & 5 deletions src/ICSharpCode.SharpZipLib/Tar/TarExtendedHeaderReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Text;

namespace ICSharpCode.SharpZipLib.Tar
Expand Down Expand Up @@ -26,7 +27,10 @@ public class TarExtendedHeaderReader

private int state = LENGTH;

private static readonly byte[] StateNext = new[] { (byte)' ', (byte)'=', (byte)'\n' };
private int currHeaderLength;
private int currHeaderRead;

private static readonly byte[] StateNext = { (byte)' ', (byte)'=', (byte)'\n' };

/// <summary>
/// Creates a new <see cref="TarExtendedHeaderReader"/>.
Expand All @@ -46,23 +50,46 @@ public void Read(byte[] buffer, int length)
for (int i = 0; i < length; i++)
{
byte next = buffer[i];

var foundStateEnd = state == VALUE
? currHeaderRead == currHeaderLength -1
: next == StateNext[state];

if (next == StateNext[state])
if (foundStateEnd)
{
Flush();
headerParts[state] = sb.ToString();
sb.Clear();

if (++state == END)
{
headers.Add(headerParts[KEY], headerParts[VALUE]);
if (!headers.ContainsKey(headerParts[KEY]))
{
headers.Add(headerParts[KEY], headerParts[VALUE]);
}

headerParts = new string[3];
currHeaderLength = 0;
currHeaderRead = 0;
state = LENGTH;
}
else
{
currHeaderRead++;
}


if (state != VALUE) continue;

if (int.TryParse(headerParts[LENGTH], out var vl))
{
currHeaderLength = vl;
}
}
else
{
byteBuffer[bbIndex++] = next;
currHeaderRead++;
if (bbIndex == 4)
Flush();
}
Expand Down