starred/sharpcompress
1
0
Fork 0
mirror of https://github.com/adamhathcock/sharpcompress.git synced 2026-09-24 16:05:27 +00:00
Code Issues 975 Packages Projects Releases 25 Wiki Activity

add max transfer size to tar

Browse Source
This commit is contained in:
Adam Hathcock
2024-04-09 15:35:15 +01:00
parent 2321d9dbee
commit fdfaa8ab45
2 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/SharpCompress/Utility.cs
View File

@@ -269,7 +269,7 @@ public static class Utility
return sTime.AddSeconds(unixtime);
}
public static long TransferTo(this Stream source, Stream destination, long? size = null)
public static long TransferTo(this Stream source, Stream destination)
{
var array = GetTransferByteArray();
try
@@ -277,16 +277,32 @@ public static class Utility
long total = 0;
while (ReadTransferBlock(source, array, out var count))
{
if (size is not null && total + count > size)
destination.Write(array, 0, count);
total += count;
}
return total;
}
finally
{
ArrayPool<byte>.Shared.Return(array);
}
}
public static long TransferTo(this Stream source, Stream destination, int size)
{
var array = GetTransferByteArray();
try
{
long total = 0;
var remaining = size;
while (ReadTransferBlock(source, array, remaining, out var count))
{
destination.Write(array, 0, count);
total += count;
remaining -= count;
if (remaining - count < 0)
{
var bytesToWrite = (int)(size - total);
destination.Write(array, 0, bytesToWrite);
total += bytesToWrite;
}
else
{
destination.Write(array, 0, count);
total += count;
break;
}
}
return total;
@@ -327,6 +343,16 @@ public static class Utility
private static bool ReadTransferBlock(Stream source, byte[] array, out int count) =>
(count = source.Read(array, 0, array.Length)) != 0;
private static bool ReadTransferBlock(Stream source, byte[] array, int size, out int count)
{
if (size > array.Length)
{
size = array.Length;
}
count = source.Read(array, 0, size);
return count != 0;
}
private static byte[] GetTransferByteArray() => ArrayPool<byte>.Shared.Rent(81920);
public static bool ReadFully(this Stream stream, byte[] buffer)

8
src/SharpCompress/Writers/Tar/TarWriter.cs
View File

@@ -91,7 +91,13 @@ public class TarWriter : AbstractWriter
header.Size = realSize;
header.Write(OutputStream);
size = source.TransferTo(OutputStream, realSize);
if (realSize >= int.MaxValue)
{
throw new NotSupportedException(
"TarWriter does not support writing files larger than 2GB."
);
}
size = source.TransferTo(OutputStream, (int)realSize);
PadTo512(size.Value);
}