From 8bbec3474aa6746b0ec79086b81b6d89ca90bf04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?nils=20m=C3=A5s=C3=A9n?= <nils@piksel.se>
Date: Sun, 10 Oct 2021 02:06:29 +0200
Subject: [PATCH 1/2] fix(tar): read full extended headers

---
 .../Tar/TarExtendedHeaderReader.cs            | 38 ++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/ICSharpCode.SharpZipLib/Tar/TarExtendedHeaderReader.cs b/src/ICSharpCode.SharpZipLib/Tar/TarExtendedHeaderReader.cs
index d1d438ad0..ace27ca88 100644
--- a/src/ICSharpCode.SharpZipLib/Tar/TarExtendedHeaderReader.cs
+++ b/src/ICSharpCode.SharpZipLib/Tar/TarExtendedHeaderReader.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Text;
 
 namespace ICSharpCode.SharpZipLib.Tar
@@ -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"/>.
@@ -46,23 +50,47 @@ 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]);
+						Console.WriteLine($"KEY: {headerParts[KEY]}");
+						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();
 				}

From 218b21995df8a9196541b3daba40e4932fedd27d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?nils=20m=C3=A5s=C3=A9n?= <nils@piksel.se>
Date: Sun, 14 Aug 2022 10:33:09 +0200
Subject: [PATCH 2/2] Update
 src/ICSharpCode.SharpZipLib/Tar/TarExtendedHeaderReader.cs

---
 src/ICSharpCode.SharpZipLib/Tar/TarExtendedHeaderReader.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ICSharpCode.SharpZipLib/Tar/TarExtendedHeaderReader.cs b/src/ICSharpCode.SharpZipLib/Tar/TarExtendedHeaderReader.cs
index ace27ca88..b711e6d54 100644
--- a/src/ICSharpCode.SharpZipLib/Tar/TarExtendedHeaderReader.cs
+++ b/src/ICSharpCode.SharpZipLib/Tar/TarExtendedHeaderReader.cs
@@ -63,7 +63,6 @@ public void Read(byte[] buffer, int length)
 					
 					if (++state == END)
 					{
-						Console.WriteLine($"KEY: {headerParts[KEY]}");
 						if (!headers.ContainsKey(headerParts[KEY]))
 						{
 							headers.Add(headerParts[KEY], headerParts[VALUE]);