summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-02-02 17:59:45 +0100
committerGitHub <noreply@github.com>2018-02-02 17:59:45 +0100
commit2e6776909b6487280266f34ecd4bb33e2458760e (patch)
tree85fc8ced6cc673f57a8c410e791e026d06be44dd /src/core/hle
parent[WIP] sfdnsres: stub (#146) (diff)
parentshared_memory: Only mark addresses as invalid if they are within the heap (diff)
downloadyuzu-2e6776909b6487280266f34ecd4bb33e2458760e.tar
yuzu-2e6776909b6487280266f34ecd4bb33e2458760e.tar.gz
yuzu-2e6776909b6487280266f34ecd4bb33e2458760e.tar.bz2
yuzu-2e6776909b6487280266f34ecd4bb33e2458760e.tar.lz
yuzu-2e6776909b6487280266f34ecd4bb33e2458760e.tar.xz
yuzu-2e6776909b6487280266f34ecd4bb33e2458760e.tar.zst
yuzu-2e6776909b6487280266f34ecd4bb33e2458760e.zip
Diffstat (limited to 'src/core/hle')
-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;