franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7973 from Morph1984/debug-crash

Browse Source 
host_memory: Fix fastmem crashes in debug builds
This commit is contained in:
Fernando S 2022-03-06 04:49:27 +01:00 committed by GitHub
commit 5192c64991
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/host_memory.cpp
View File

@ -327,8 +327,8 @@ private:
bool IsNiechePlaceholder(size_t virtual_offset, size_t length) const { bool IsNiechePlaceholder(size_t virtual_offset, size_t length) const {
const auto it = placeholders.upper_bound({virtual_offset, virtual_offset + length}); const auto it = placeholders.upper_bound({virtual_offset, virtual_offset + length});
if (it != placeholders.end() && it->lower() == virtual_offset + length) { if (it != placeholders.end() && it->lower() == virtual_offset + length) {
const bool is_root = it == placeholders.begin() && virtual_offset == 0; return it == placeholders.begin() ? virtual_offset == 0
return is_root || std::prev(it)->upper() == virtual_offset; : std::prev(it)->upper() == virtual_offset;
} }
return false; return false;
} }