From 6ed13c3b41e7e6dfabc9215c8a69e0d9c84f0d85 Mon Sep 17 00:00:00 2001
From: Dan Kroymann <dan@recroom.com>
Date: Thu, 17 Feb 2022 09:16:06 -0800
Subject: [PATCH] Fix a bug in LoadAsync(filePath) where the FileStream was
 being disposed too early

---
 src/ImageSharp/Image.FromFile.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/ImageSharp/Image.FromFile.cs b/src/ImageSharp/Image.FromFile.cs
index fce0835fb..345a5e6c8 100644
--- a/src/ImageSharp/Image.FromFile.cs
+++ b/src/ImageSharp/Image.FromFile.cs
@@ -298,7 +298,7 @@ namespace SixLabors.ImageSharp
         /// <exception cref="NotSupportedException">Image format is not supported.</exception>
         /// <exception cref="InvalidImageContentException">Image contains invalid content.</exception>
         /// <returns>A <see cref="Task{Image}"/> representing the asynchronous operation.</returns>
-        public static Task<Image> LoadAsync(
+        public static async Task<Image> LoadAsync(
             Configuration configuration,
             string path,
             IImageDecoder decoder,
@@ -308,7 +308,8 @@ namespace SixLabors.ImageSharp
             Guard.NotNull(path, nameof(path));
 
             using Stream stream = configuration.FileSystem.OpenRead(path);
-            return LoadAsync(configuration, stream, decoder, cancellationToken);
+            return await LoadAsync(configuration, stream, decoder, cancellationToken)
+                .ConfigureAwait(false);
         }
 
         /// <summary>
@@ -326,7 +327,7 @@ namespace SixLabors.ImageSharp
         /// <exception cref="InvalidImageContentException">Image contains invalid content.</exception>
         /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <returns>A <see cref="Task{Image}"/> representing the asynchronous operation.</returns>
-        public static Task<Image<TPixel>> LoadAsync<TPixel>(
+        public static async Task<Image<TPixel>> LoadAsync<TPixel>(
             Configuration configuration,
             string path,
             IImageDecoder decoder,
@@ -337,7 +338,8 @@ namespace SixLabors.ImageSharp
             Guard.NotNull(path, nameof(path));
 
             using Stream stream = configuration.FileSystem.OpenRead(path);
-            return LoadAsync<TPixel>(configuration, stream, decoder, cancellationToken);
+            return await LoadAsync<TPixel>(configuration, stream, decoder, cancellationToken)
+                .ConfigureAwait(false);
         }
 
         /// <summary>