Fix virtual memory allocation being out of range (#2464)

sxpisces · Jul 11, 2021 · b5190f1 · b5190f1
1 parent 0d841c8
commit b5190f1
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Ryujinx.HLE/HOS/Kernel/Memory/KPageTableBase.cs b/Ryujinx.HLE/HOS/Kernel/Memory/KPageTableBase.cs
@@ -2411,9 +2411,11 @@ private ulong FindFirstFit(
             {
                 if (info.State == MemoryState.Unmapped)
                 {
-                    ulong currBaseAddr = info.Address + reservedSize;
+                    ulong currBaseAddr = info.Address <= regionStart ? regionStart : info.Address;
                     ulong currEndAddr = info.Address + info.Size - 1;
 
+                    currBaseAddr += reservedSize;
+
                     ulong address = BitUtils.AlignDown(currBaseAddr, alignment) + reservedStart;
 
                     if (currBaseAddr > address)
@@ -2423,9 +2425,10 @@ private ulong FindFirstFit(
 
                     ulong allocationEndAddr = address + totalNeededSize - 1;
 
-                    if (allocationEndAddr <= regionEndAddr &&
-                        allocationEndAddr <= currEndAddr &&
-                        address < allocationEndAddr)
+                    if (info.Address <= address &&
+                        address < allocationEndAddr &&
+                        allocationEndAddr <= regionEndAddr &&
+                        allocationEndAddr <= currEndAddr)
                     {
                         return address;
                     }