From 7ac5c86ba933fd02148e72c88b467b2313fdb8d3 Mon Sep 17 00:00:00 2001 From: Jim Ingham Date: Thu, 21 May 2015 00:27:01 +0000 Subject: [PATCH] Fix the logic in DynamicLoaderMacOSXDYLD::Clear that would only remove the old dyld notification breakpoint only if the process it was for is still alive. We need to always remove this because it has a pointer to the old loader, and if we ever hit it we will crash. I also put in a sanity check in the callback function to make sure we don't invoke it if the process is wrong. llvm-svn: 237866 --- .../MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp index 711099122b5f..80fe25318450 100644 --- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp +++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp @@ -242,7 +242,7 @@ DynamicLoaderMacOSXDYLD::Clear (bool clear_process) { Mutex::Locker locker(m_mutex); - if (m_process->IsAlive() && LLDB_BREAK_ID_IS_VALID(m_break_id)) + if (LLDB_BREAK_ID_IS_VALID(m_break_id)) m_process->GetTarget().RemoveBreakpointByID (m_break_id); if (clear_process) @@ -607,11 +607,16 @@ DynamicLoaderMacOSXDYLD::NotifyBreakpointHit (void *baton, // will do so and return true. In the course of initializing the all_image_infos it will read the complete // current state, so we don't need to figure out what has changed from the data passed in to us. + ExecutionContext exe_ctx (context->exe_ctx_ref); + Process *process = exe_ctx.GetProcessPtr(); + + // This is a sanity check just in case this dyld_instance is an old dyld plugin's breakpoint still lying around. + if (process != dyld_instance->m_process) + return false; + if (dyld_instance->InitializeFromAllImageInfos()) return dyld_instance->GetStopWhenImagesChange(); - ExecutionContext exe_ctx (context->exe_ctx_ref); - Process *process = exe_ctx.GetProcessPtr(); const lldb::ABISP &abi = process->GetABI(); if (abi) {