summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorshinyquagsire23 <mtinc2@gmail.com>2018-01-30 07:38:56 +0100
committershinyquagsire23 <mtinc2@gmail.com>2018-01-30 07:38:56 +0100
commit96c444d1ffff5b9e5a28c5d632a12e90a740858f (patch)
tree162c8a9f240bf17deb66b9607c41397ab46b5dca /src/core
parentMerge pull request #151 from lioncash/catch (diff)
downloadyuzu-96c444d1ffff5b9e5a28c5d632a12e90a740858f.tar
yuzu-96c444d1ffff5b9e5a28c5d632a12e90a740858f.tar.gz
yuzu-96c444d1ffff5b9e5a28c5d632a12e90a740858f.tar.bz2
yuzu-96c444d1ffff5b9e5a28c5d632a12e90a740858f.tar.lz
yuzu-96c444d1ffff5b9e5a28c5d632a12e90a740858f.tar.xz
yuzu-96c444d1ffff5b9e5a28c5d632a12e90a740858f.tar.zst
yuzu-96c444d1ffff5b9e5a28c5d632a12e90a740858f.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/kernel/shared_memory.cpp3
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;