Skip to content

[lldb] Fix unsafe map mutation in ProcessElfCore::FindModuleUUID #159444

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 1 commit into from
Sep 18, 2025
Merged

[lldb] Fix unsafe map mutation in ProcessElfCore::FindModuleUUID #159444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,13 @@ llvm::StringRef ProcessElfCore::GetMainExecutablePath() {
}

UUID ProcessElfCore::FindModuleUUID(const llvm::StringRef path) {
return m_uuids[std::string(path)];
// Lookup the UUID for the given path in the map.
// Note that this could be called by multiple threads so make sure
// we access the map in a thread safe way (i.e. don't use operator[]).
auto it = m_uuids.find(std::string(path));
if (it != m_uuids.end())
return it->second;
return UUID();
}

lldb_private::DynamicLoader *ProcessElfCore::GetDynamicLoader() {
Expand Down
2 changes: 0 additions & 2 deletions lldb/test/API/functionalities/postmortem/netbsd-core/TestNetBSDCore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@ def check_backtrace(self, thread, filename, backtrace):
)

def do_test(self, filename, pid, region_count):
# Temporary workaround for https://github.com/llvm/llvm-project/issues/159377
self.runCmd("settings set target.parallel-module-load false")
target = self.dbg.CreateTarget(filename)
process = target.LoadCore(filename + ".core")

Expand Down
Loading