Browse Source

Better error handling in action wrapper

pull/2276/head
James Jackson-South 4 years ago
parent
commit
1dd2d6e40f
  1. 46
      src/ImageSharp/Formats/ImageDecoder.cs

46
src/ImageSharp/Formats/ImageDecoder.cs

@ -181,7 +181,7 @@ public abstract class ImageDecoder : IImageDecoder
return action(memoryStream); return action(memoryStream);
} }
internal static async Task<T> WithSeekableMemoryStreamAsync<T>( internal static Task<T> WithSeekableMemoryStreamAsync<T>(
DecoderOptions options, DecoderOptions options,
Stream stream, Stream stream,
Func<Stream, CancellationToken, T> action, Func<Stream, CancellationToken, T> action,
@ -195,20 +195,31 @@ public abstract class ImageDecoder : IImageDecoder
throw new NotSupportedException("Cannot read from the stream."); throw new NotSupportedException("Cannot read from the stream.");
} }
T PeformActionAndResetPosition(Stream s, long position, CancellationToken ct) Task<T> PeformActionAndResetPosition(Stream s, long position, CancellationToken ct)
{ {
T result = action(s, ct); try
// Issue #2259. Our buffered reads may have left the stream in an incorrect non-zero position.
// Reset the position of the seekable stream if we did not read to the end to allow additional reads.
// We check here that the input stream is seekable because it is not guaranteed to be so since
// we always copy input streams of unknown type.
if (stream.CanSeek && stream.Position != s.Position && s.Position != s.Length)
{ {
stream.Position = position + s.Position; T result = action(s, ct);
// Issue #2259. Our buffered reads may have left the stream in an incorrect non-zero position.
// Reset the position of the seekable stream if we did not read to the end to allow additional reads.
// We check here that the input stream is seekable because it is not guaranteed to be so since
// we always copy input streams of unknown type.
if (stream.CanSeek && stream.Position != s.Position && s.Position != s.Length)
{
stream.Position = position + s.Position;
}
return Task.FromResult(result);
}
catch (OperationCanceledException)
{
return Task.FromCanceled<T>(cancellationToken);
}
catch (Exception ex)
{
return Task.FromException<T>(ex);
} }
return result;
} }
// NOTE: We are explicitly not executing the action against the stream here as we do in WithSeekableStream() because that // NOTE: We are explicitly not executing the action against the stream here as we do in WithSeekableStream() because that
@ -224,11 +235,20 @@ public abstract class ImageDecoder : IImageDecoder
return PeformActionAndResetPosition(cms, cms.Position, cancellationToken); return PeformActionAndResetPosition(cms, cms.Position, cancellationToken);
} }
return CopyToMemoryStreamAndActionAsync(options, stream, PeformActionAndResetPosition, cancellationToken);
}
private static async Task<T> CopyToMemoryStreamAndActionAsync<T>(
DecoderOptions options,
Stream stream,
Func<Stream, long, CancellationToken, Task<T>> action,
CancellationToken cancellationToken)
{
long position = stream.CanSeek ? stream.Position : 0; long position = stream.CanSeek ? stream.Position : 0;
Configuration configuration = options.Configuration; Configuration configuration = options.Configuration;
using ChunkedMemoryStream memoryStream = new(configuration.MemoryAllocator); using ChunkedMemoryStream memoryStream = new(configuration.MemoryAllocator);
await stream.CopyToAsync(memoryStream, configuration.StreamProcessingBufferSize, cancellationToken).ConfigureAwait(false); await stream.CopyToAsync(memoryStream, configuration.StreamProcessingBufferSize, cancellationToken).ConfigureAwait(false);
memoryStream.Position = 0; memoryStream.Position = 0;
return PeformActionAndResetPosition(memoryStream, position, cancellationToken); return await action(memoryStream, position, cancellationToken).ConfigureAwait(false);
} }
} }

Loading…
Cancel
Save