Mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-05-14 08:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Avoid to access invalid iterator (#1892)

Browse source
This commit is contained in:
mailwl 2024-12-27 17:43:10 +03:00 • committed by GitHub
parent 9b8de8d320
commit 0677d7a214
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/memory.cpp
View file

@ -101,13 +101,17 @@ PAddr MemoryManager::Allocate(PAddr search_start, PAddr search_end, size_t size,
auto dmem_area = FindDmemArea(search_start); auto dmem_area = FindDmemArea(search_start);
const auto is_suitable = [&] { const auto is_suitable = [&] {
if (dmem_area == dmem_map.end()) {
return false;
}
const auto aligned_base = Common::AlignUp(dmem_area->second.base, alignment); const auto aligned_base = Common::AlignUp(dmem_area->second.base, alignment);
const auto alignment_size = aligned_base - dmem_area->second.base; const auto alignment_size = aligned_base - dmem_area->second.base;
const auto remaining_size = const auto remaining_size =
dmem_area->second.size >= alignment_size ? dmem_area->second.size - alignment_size : 0; dmem_area->second.size >= alignment_size ? dmem_area->second.size - alignment_size : 0;
return dmem_area->second.is_free && remaining_size >= size; return dmem_area->second.is_free && remaining_size >= size;
}; };
while (!is_suitable() && dmem_area->second.GetEnd() <= search_end) { while (dmem_area != dmem_map.end() && !is_suitable() &&
dmem_area->second.GetEnd() <= search_end) {
++dmem_area; ++dmem_area;
} }
ASSERT_MSG(is_suitable(), "Unable to find free direct memory area: size = {:#x}", size); ASSERT_MSG(is_suitable(), "Unable to find free direct memory area: size = {:#x}", size);