maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Don't refer to allocation map entry after deallocating it 

debugserver's MachTask::DeallocateMemory when removing an
allocate entry from our map (in resposne to an '_m' packet),
copy the size from the entry before removing it from the
map and then using the iterator to fix an ASAN error on
the bots when running TestGdbRemoteMemoryAllocation.py

rdar://76595998
This commit is contained in:
Jason Molenda 2021-04-15 18:58:13 -07:00
parent 0148b65372
commit 9d4415d01d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lldb/tools/debugserver/source/MacOSX/MachTask.mm
View File

@ -984,15 +984,15 @@ nub_bool_t MachTask::DeallocateMemory(nub_addr_t addr) {
allocation_collection::iterator pos, end = m_allocations.end();
for (pos = m_allocations.begin(); pos != end; pos++) {
if ((*pos).first == addr) {
size_t size = (*pos).second;
m_allocations.erase(pos);
#define ALWAYS_ZOMBIE_ALLOCATIONS 0
if (ALWAYS_ZOMBIE_ALLOCATIONS ||
getenv("DEBUGSERVER_ZOMBIE_ALLOCATIONS")) {
::mach_vm_protect(task, (*pos).first, (*pos).second, 0, VM_PROT_NONE);
::mach_vm_protect(task, addr, size, 0, VM_PROT_NONE);
return true;
} else
return ::mach_vm_deallocate(task, (*pos).first, (*pos).second) ==
KERN_SUCCESS;
return ::mach_vm_deallocate(task, addr, size) == KERN_SUCCESS;
}
}
return false;