diff options
| author | bunnei <bunneidev@gmail.com> | 2018-02-02 08:59:45 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-02 08:59:45 -0800 |
| commit | 2e6776909b6487280266f34ecd4bb33e2458760e (patch) | |
| tree | 85fc8ced6cc673f57a8c410e791e026d06be44dd /src | |
| parent | eaa9f968a629b8743f22a2277a5332942a3cd9d9 (diff) | |
| parent | 96c444d1ffff5b9e5a28c5d632a12e90a740858f (diff) | |
Merge pull request #152 from shinyquagsire23/sharedmem-valid-bounds
shared_memory: Only mark addresses as invalid if they are within the heap
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/shared_memory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp index 7279366ec..f8aa429dc 100644 --- a/src/core/hle/kernel/shared_memory.cpp +++ b/src/core/hle/kernel/shared_memory.cpp @@ -136,7 +136,8 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi // can not map it in its own address space unless it was created with addr=0, result 0xD900182C. if (address != 0) { - if (address < Memory::HEAP_VADDR) { + // TODO(shinyquagsire23): Check for virtual/mappable memory here too? + if (address >= Memory::HEAP_VADDR && address < Memory::HEAP_VADDR_END) { LOG_ERROR(Kernel, "cannot map id=%u, address=0x%llx name=%s, invalid address", GetObjectId(), address, name.c_str()); return ERR_INVALID_ADDRESS; |