Fixing Retain to return MemoryHandle with correct PinnedPointer (#14248)

* Fixing Retain to return MemoryHandle with correct PinnedPointer.

* Make MemoryHandle AddOffset internal.

Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>

Author: ahsonkhan

src/Common/src/CoreLib/System/Buffers/MemoryHandle.cs

@@ -21,6 +21,18 @@ public unsafe struct MemoryHandle : IDisposable
             _handle = handle;
         }
 
+        internal void AddOffset(int offset)
+        {
+            if (_pointer == null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.pointer);
+            }
+            else
+            {
+                _pointer = (void*)((byte*)_pointer + offset);
+            }
+        }
+
         [CLSCompliant(false)]
         public void* PinnedPointer => _pointer;
 

src/Common/src/CoreLib/System/Memory.cs

@@ -185,6 +185,7 @@ public unsafe MemoryHandle Retain(bool pin = false)
                 if (_index < 0)
                 {
                     memoryHandle = ((OwnedMemory<T>)_arrayOrOwnedMemory).Pin();
+                    memoryHandle.AddOffset((_index & RemoveOwnedFlagBitMask) * Unsafe.SizeOf<T>());
                 }
                 else
                 {

src/Common/src/CoreLib/System/ReadOnlyMemory.cs

@@ -170,6 +170,7 @@ public unsafe MemoryHandle Retain(bool pin = false)
                 if (_index < 0)
                 {
                     memoryHandle = ((OwnedMemory<T>)_arrayOrOwnedMemory).Pin();
+                    memoryHandle.AddOffset((_index & RemoveOwnedFlagBitMask) * Unsafe.SizeOf<T>());
                 }
                 else
                 {