Skip to content

Make snapshot load position-independent (match libraries by basename) #1780

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
Bike merged 1 commit into from
Jun 6, 2026
Merged

Make snapshot load position-independent (match libraries by basename) #1780

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
14 changes: 12 additions & 2 deletions src/core/debugger.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,20 @@ void executableTextSectionRange(gctools::clasp_ptr_t& start, gctools::clasp_ptr_
bool library_with_name(const std::string& name, bool isExecutable, std::string& libraryName, uintptr_t& start, uintptr_t& end,
uintptr_t& vtableStart, uintptr_t& vtableEnd) {
WITH_READ_LOCK(debugInfo()._OpenDynamicLibraryMutex);
// Match libraries by basename (SONAME), not by requiring the recorded name to be a path-suffix
// of the loaded library. The recorded name can be an absolute path captured at snapshot-save
// time; if the library is later loaded from a different directory (a relocated/bundled install,
// or the target's /usr/lib vs a build path) the old suffix test fails and snapshot load aborts.
// Comparing basenames makes snapshot load position-independent.
auto base_name = [](const std::string& p) -> std::string {
std::size_t slash = p.find_last_of('/');
return slash == std::string::npos ? p : p.substr(slash + 1);
};
const std::string nameBase = base_name(name);
for (auto entry : debugInfo()._OpenDynamicLibraryHandles) {
std::string libName = entry.second->_Filename;
if (ExecutableLibraryInfo* eli = dynamic_cast<ExecutableLibraryInfo*>(entry.second)) {
if (isExecutable || (name.size() <= libName.size() && name == libName.substr(libName.size() - name.size()))) {
if (isExecutable || base_name(libName) == nameBase) {
libraryName = eli->_Filename;
start = (uintptr_t)(eli->_TextStart);
end = (uintptr_t)(eli->_TextEnd);
Expand All @@ -278,7 +288,7 @@ bool library_with_name(const std::string& name, bool isExecutable, std::string&
return true;
}
} else {
if (name.size() <= libName.size() && name == libName.substr(libName.size() - name.size())) {
if (base_name(libName) == nameBase) {
if (isExecutable) {
printf("%s:%d:%s THERE IS A PROBLEM - The library %s is being searched for as Executable but it is not\n", __FILE__,
__LINE__, __FUNCTION__, name.c_str());
Expand Down
Loading