Skip to content

[lldb-dap] Fix segfault in JSONUtils.cpp when GetUUIDString() returns nullptr #169844

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 4 commits into from
Dec 1, 2025
Merged

[lldb-dap] Fix segfault in JSONUtils.cpp when GetUUIDString() returns nullptr #169844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
93984ba
[lldb-dap] Fix segfault in JSONUtils.cpp when GetUUIDString() returns…
aahrun Nov 27, 2025
de60e81
Update lldb/tools/lldb-dap/JSONUtils.cpp
aahrun Nov 28, 2025
d61821f
Applied feedback from PR
aahrun Nov 28, 2025
291da70
Removed unnecessary include
aahrun Dec 1, 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
6 changes: 3 additions & 3 deletions lldb/tools/lldb-dap/Handler/CompileUnitsRequestHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ void CompileUnitsRequestHandler::operator()(
llvm::json::Object body;
llvm::json::Array units;
const auto *arguments = request.getObject("arguments");
const std::string module_id =
GetString(arguments, "moduleId").value_or("").str();
const llvm::StringRef module_id =
GetString(arguments, "moduleId").value_or("");
int num_modules = dap.target.GetNumModules();
for (int i = 0; i < num_modules; i++) {
auto curr_module = dap.target.GetModuleAtIndex(i);
if (module_id == curr_module.GetUUIDString()) {
if (module_id == llvm::StringRef(curr_module.GetUUIDString())) {
int num_units = curr_module.GetNumCompileUnits();
for (int j = 0; j < num_units; j++) {
auto curr_unit = curr_module.GetCompileUnitAtIndex(j);
Expand Down
5 changes: 2 additions & 3 deletions lldb/tools/lldb-dap/JSONUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,9 +554,8 @@ llvm::json::Value CreateStackFrame(DAP &dap, lldb::SBFrame &frame,

lldb::SBModule module = frame.GetModule();
if (module.IsValid()) {
std::string uuid = module.GetUUIDString();
if (!uuid.empty())
object.try_emplace("moduleId", uuid);
if (const llvm::StringRef uuid = module.GetUUIDString(); !uuid.empty())
object.try_emplace("moduleId", uuid.str());
}

return llvm::json::Value(std::move(object));
Expand Down
Loading