summaryrefslogtreecommitdiff
path: root/src/common/host_memory.cpp
diff options
context:
space:
mode:
authorGravatar Fernando S2022-03-06 04:49:27 +0100
committerGravatar GitHub2022-03-06 04:49:27 +0100
commit5192c6499152dce28bdd07d4c0b21703cd7b5ae0 (patch)
treec169f0a89c5884ab678b3882d0e7ddf5c1ea13ff /src/common/host_memory.cpp
parentMerge pull request #7935 from Wunkolo/logging-join-fix (diff)
parenthost_memory: Fix fastmem crashes in debug builds (diff)
downloadyuzu-5192c6499152dce28bdd07d4c0b21703cd7b5ae0.tar.gz
yuzu-5192c6499152dce28bdd07d4c0b21703cd7b5ae0.tar.xz
yuzu-5192c6499152dce28bdd07d4c0b21703cd7b5ae0.zip
Merge pull request #7973 from Morph1984/debug-crash
host_memory: Fix fastmem crashes in debug builds
Diffstat (limited to 'src/common/host_memory.cpp')
-rw-r--r--src/common/host_memory.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/host_memory.cpp b/src/common/host_memory.cpp
index 28949fe5e..c465cfc14 100644
--- a/src/common/host_memory.cpp
+++ b/src/common/host_memory.cpp
@@ -327,8 +327,8 @@ private:
327 bool IsNiechePlaceholder(size_t virtual_offset, size_t length) const { 327 bool IsNiechePlaceholder(size_t virtual_offset, size_t length) const {
328 const auto it = placeholders.upper_bound({virtual_offset, virtual_offset + length}); 328 const auto it = placeholders.upper_bound({virtual_offset, virtual_offset + length});
329 if (it != placeholders.end() && it->lower() == virtual_offset + length) { 329 if (it != placeholders.end() && it->lower() == virtual_offset + length) {
330 const bool is_root = it == placeholders.begin() && virtual_offset == 0; 330 return it == placeholders.begin() ? virtual_offset == 0
331 return is_root || std::prev(it)->upper() == virtual_offset; 331 : std::prev(it)->upper() == virtual_offset;
332 } 332 }
333 return false; 333 return false;
334 } 334 }