Fix GetWritableRegion write-back (#2456)

sxpisces · Jul 10, 2021 · b1a9d17 · b1a9d17
1 parent 59900d7
commit b1a9d17
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Ryujinx.Memory/IVirtualMemoryManager.cs b/Ryujinx.Memory/IVirtualMemoryManager.cs
@@ -66,7 +66,9 @@ void Fill(ulong va, ulong size, byte value)
             {
                 int copySize = (int)Math.Min(MaxChunkSize, size - subOffset);
 
-                GetWritableRegion(va + subOffset, copySize).Memory.Span.Fill(0);
+                using var writableRegion = GetWritableRegion(va + subOffset, copySize);
+
+                writableRegion.Memory.Span.Fill(0);
             }
         }
 

diff --git a/Ryujinx.Memory/MemoryBlock.cs b/Ryujinx.Memory/MemoryBlock.cs
@@ -333,7 +333,7 @@ public unsafe Memory<byte> GetMemory(ulong offset, int size)
         /// <exception cref="InvalidMemoryRegionException">Throw when either <paramref name="offset"/> or <paramref name="size"/> are out of range</exception>
         public WritableRegion GetWritableRegion(ulong offset, int size)
         {
-            return new WritableRegion(this, offset, GetMemory(offset, size));
+            return new WritableRegion(null, offset, GetMemory(offset, size));
         }
 
         /// <summary>