From 27ede235a3766c2673e45928f822d421ab610f51 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Sat, 20 Nov 2021 14:35:02 +0100
Subject: [PATCH] fixes

---
 .../Allocators/UniformUnmanagedMemoryPoolMemoryAllocator.cs   | 2 ++
 src/ImageSharp/Memory/DiscontiguousBuffers/MemoryGroup{T}.cs  | 2 +-
 .../Allocators/UniformUnmanagedPoolMemoryAllocatorTests.cs    | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/ImageSharp/Memory/Allocators/UniformUnmanagedMemoryPoolMemoryAllocator.cs b/src/ImageSharp/Memory/Allocators/UniformUnmanagedMemoryPoolMemoryAllocator.cs
index 5fc563d095..2e664b4133 100644
--- a/src/ImageSharp/Memory/Allocators/UniformUnmanagedMemoryPoolMemoryAllocator.cs
+++ b/src/ImageSharp/Memory/Allocators/UniformUnmanagedMemoryPoolMemoryAllocator.cs
@@ -106,6 +106,8 @@ namespace SixLabors.ImageSharp.Memory
                     {
                         buffer.Clear();
                     }
+
+                    return buffer;
                 }
             }
 
diff --git a/src/ImageSharp/Memory/DiscontiguousBuffers/MemoryGroup{T}.cs b/src/ImageSharp/Memory/DiscontiguousBuffers/MemoryGroup{T}.cs
index f517482d7b..da7419b4bb 100644
--- a/src/ImageSharp/Memory/DiscontiguousBuffers/MemoryGroup{T}.cs
+++ b/src/ImageSharp/Memory/DiscontiguousBuffers/MemoryGroup{T}.cs
@@ -200,7 +200,7 @@ namespace SixLabors.ImageSharp.Memory
                 return null;
             }
 
-            return new Owned(pool, arrays, bufferLength, totalLengthInElements, sizeOfLastBuffer);
+            return new Owned(pool, arrays, bufferLength, totalLengthInElements, sizeOfLastBuffer, options);
         }
 
         public static MemoryGroup<T> Wrap(params Memory<T>[] source)
diff --git a/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedPoolMemoryAllocatorTests.cs b/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedPoolMemoryAllocatorTests.cs
index a08cfb7412..4b4a04df88 100644
--- a/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedPoolMemoryAllocatorTests.cs
+++ b/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedPoolMemoryAllocatorTests.cs
@@ -329,8 +329,8 @@ namespace SixLabors.ImageSharp.Tests.Memory.Allocators
         [InlineData(1200)]
         public void MemoryOwnerFinalizer_ReturnsToPool(int length)
         {
-            RunTest(length.ToString());
-            // RemoteExecutor.Invoke(RunTest, length.ToString()).Dispose();
+            // RunTest(length.ToString());
+            RemoteExecutor.Invoke(RunTest, length.ToString()).Dispose();
 
             static void RunTest(string lengthStr)
             {