archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-06 23:11:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Memory: fix critical bug in shm::unmap_critical (Linux)

Browse source 
It was leaving holes in reserved areas.
Windows is unaffected.
This commit is contained in:
Nekotekina 2021-01-14 18:04:29 +03:00
parent 4bee8dc37f
commit ea916fd7e1
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/util/vm_native.cpp
View file

@ -396,9 +396,9 @@ namespace utils
{ {
const auto target = reinterpret_cast<u8*>(reinterpret_cast<u64>(ptr) & -0x10000); const auto target = reinterpret_cast<u8*>(reinterpret_cast<u64>(ptr) & -0x10000);
#ifdef _WIN32
this->unmap(target); this->unmap(target);
#ifdef _WIN32
::MEMORY_BASIC_INFORMATION mem, mem2; ::MEMORY_BASIC_INFORMATION mem, mem2;
if (!::VirtualQuery(target - 1, &mem, sizeof(mem)) || !::VirtualQuery(target + m_size, &mem2, sizeof(mem2))) if (!::VirtualQuery(target - 1, &mem, sizeof(mem)) || !::VirtualQuery(target + m_size, &mem2, sizeof(mem2)))
{ {
@ -422,6 +422,8 @@ namespace utils
{ {
return; return;
} }
#else
::mmap(reinterpret_cast<void*>(target), m_size, PROT_NONE, MAP_FIXED | MAP_ANON | MAP_PRIVATE | c_map_noreserve, -1, 0);
#endif #endif
} }