alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-02 05:48:47 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Explicitly handle MemoryStream(s)

Browse Source
This commit is contained in:
Marc Brooks
2026-05-26 23:11:01 +00:00
parent 02ca63cd13
commit c449a93372
1 changed files with 69 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
src/Jellyfin.Extensions/StreamExtensions.cs
View File

@@ -123,37 +123,84 @@ namespace Jellyfin.Extensions
return false;
}
var bufferA = ArrayPool<byte>.Shared.Rent(StreamComparisonBufferSize);
var bufferB = ArrayPool<byte>.Shared.Rent(StreamComparisonBufferSize);
try
// If b is MemoryStream but a is not, swap them to use fast path B
if (b is MemoryStream && a is not MemoryStream)
{
while (true)
(a, b) = (b, a);
}
if (a is MemoryStream ms_a)
{
var bufferA = ms_a.GetBuffer();
// Fast path A: if both streams are MemoryStreams, compare directly against each other
if (b is MemoryStream ms_b)
{
cancellationToken.ThrowIfCancellationRequested();
return bufferA.AsSpan(0, (int)ms_a.Length).SequenceEqual(ms_b.GetBuffer().AsSpan(0, (int)ms_b.Length));
}
var bytesReadA = await a.ReadAsync(bufferA.AsMemory(), cancellationToken).ConfigureAwait(false);
var bytesReadB = await b.ReadAsync(bufferB.AsMemory(), cancellationToken).ConfigureAwait(false);
if (bytesReadA != bytesReadB)
// Fast path B: only first stream is a MemoryStream, compare against second stream chunk-by-chunk
var bufferB = ArrayPool<byte>.Shared.Rent(StreamComparisonBufferSize);
try
{
var memoryB = bufferB.AsMemory();
int offset = 0;
int bytesRead;
while ((bytesRead = await b.ReadAsync(memoryB, cancellationToken).ConfigureAwait(false)) > 0)
{
return false;
cancellationToken.ThrowIfCancellationRequested();
if (!bufferA.AsSpan(offset, bytesRead).SequenceEqual(bufferB.AsSpan(0, bytesRead)))
{
return false;
}
offset += bytesRead;
}
if (bytesReadA == 0)
{
return true;
}
if (!bufferA.AsSpan(0, bytesReadA).SequenceEqual(bufferB.AsSpan(0, bytesReadB)))
{
return false;
}
return offset == ms_a.Length;
}
finally
{
ArrayPool<byte>.Shared.Return(bufferB);
}
}
finally
else
{
ArrayPool<byte>.Shared.Return(bufferA);
ArrayPool<byte>.Shared.Return(bufferB);
var bufferA = ArrayPool<byte>.Shared.Rent(StreamComparisonBufferSize);
var bufferB = ArrayPool<byte>.Shared.Rent(StreamComparisonBufferSize);
try
{
var memoryA = bufferA.AsMemory();
var memoryB = bufferB.AsMemory();
while (true)
{
cancellationToken.ThrowIfCancellationRequested();
var bytesReadA = await a.ReadAsync(memoryA, cancellationToken).ConfigureAwait(false);
var bytesReadB = await b.ReadAsync(memoryB, cancellationToken).ConfigureAwait(false);
if (bytesReadA != bytesReadB)
{
return false;
}
if (bytesReadA == 0)
{
return true;
}
if (!bufferA.AsSpan(0, bytesReadA).SequenceEqual(bufferB.AsSpan(0, bytesReadB)))
{
return false;
}
}
}
finally
{
ArrayPool<byte>.Shared.Return(bufferA);
ArrayPool<byte>.Shared.Return(bufferB);
}
}
}
}