Skip to content

[lldb] Fix a crash in lldb-server during RemoveSoftwareBreakpoint() #148738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 16, 2025
Merged

[lldb] Fix a crash in lldb-server during RemoveSoftwareBreakpoint() #148738

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
890eb98
[lldb] Fix a crash in lldb-server during RemoveSoftwareBreakpoint()
Jul 14, 2025
d15f269
Add unit test
Jul 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions lldb/source/Host/common/NativeProcessProtocol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,12 +366,19 @@ Status NativeProcessProtocol::RemoveSoftwareBreakpoint(lldb::addr_t addr) {
if (--it->second.ref_count > 0)
return Status();

// Remove the entry from m_software_breakpoints rightaway, so that we don't
// leave behind an entry with ref_count == 0 in case one of the following
// conditions returns an error. The breakpoint is moved so that it can be
// accessed below.
SoftwareBreakpoint bkpt = std::move(it->second);
m_software_breakpoints.erase(it);

// This is the last reference. Let's remove the breakpoint.
Status error;

// Clear a software breakpoint instruction
llvm::SmallVector<uint8_t, 4> curr_break_op(
it->second.breakpoint_opcodes.size(), 0);
llvm::SmallVector<uint8_t, 4> curr_break_op(bkpt.breakpoint_opcodes.size(),
0);

// Read the breakpoint opcode
size_t bytes_read = 0;
Expand All @@ -382,10 +389,10 @@ Status NativeProcessProtocol::RemoveSoftwareBreakpoint(lldb::addr_t addr) {
"addr=0x%" PRIx64 ": tried to read %zu bytes but only read %zu", addr,
curr_break_op.size(), bytes_read);
}
const auto &saved = it->second.saved_opcodes;
const auto &saved = bkpt.saved_opcodes;
// Make sure the breakpoint opcode exists at this address
if (llvm::ArrayRef(curr_break_op) != it->second.breakpoint_opcodes) {
if (curr_break_op != it->second.saved_opcodes)
if (llvm::ArrayRef(curr_break_op) != bkpt.breakpoint_opcodes) {
if (curr_break_op != bkpt.saved_opcodes)
return Status::FromErrorString(
"Original breakpoint trap is no longer in memory.");
LLDB_LOG(log,
Expand Down Expand Up @@ -418,7 +425,6 @@ Status NativeProcessProtocol::RemoveSoftwareBreakpoint(lldb::addr_t addr) {
llvm::make_range(saved.begin(), saved.end()));
}

m_software_breakpoints.erase(it);
return Status();
}

Expand Down
Loading