Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Commit

Permalink
Avoid modifying loaded library map while iterating in lib_close() (#2…
Browse files Browse the repository at this point in the history
…0941) (#20944)

* Update close libs to not modify map while iterating over opened libraries, rename loaded_libs to loaded_libs_ to signify it is a private member.

* Clean up and simplify library close code.

* Fix clang-format.
  • Loading branch information
josephevans committed Mar 9, 2022
1 parent 0c5b5b1 commit 32cef8e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 17 deletions.
22 changes: 7 additions & 15 deletions src/initialize.cc
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ LibraryInitializer::LibraryInitializer()
}

bool LibraryInitializer::lib_is_loaded(const std::string& path) const {
return loaded_libs.count(path) > 0;
return loaded_libs_.count(path) > 0;
}

/*!
Expand Down Expand Up @@ -127,9 +127,9 @@ void* LibraryInitializer::lib_load(const char* path) {
}
#endif // _WIN32 or _WIN64 or __WINDOWS__
// then store the pointer to the library
loaded_libs[path] = handle;
loaded_libs_[path] = handle;
} else {
handle = loaded_libs.at(path);
handle = loaded_libs_.at(path);
}
return handle;
}
Expand All @@ -138,15 +138,7 @@ void* LibraryInitializer::lib_load(const char* path) {
* \brief Closes the loaded dynamic shared library file
* \param handle library file handle
*/
void LibraryInitializer::lib_close(void* handle) {
std::string libpath;
for (const auto& l : loaded_libs) {
if (l.second == handle) {
libpath = l.first;
break;
}
}
CHECK(!libpath.empty());
void LibraryInitializer::lib_close(void* handle, const std::string& libpath) {
#if defined(_WIN32) || defined(_WIN64) || defined(__WINDOWS__)
FreeLibrary((HMODULE)handle);
#else
Expand All @@ -155,7 +147,6 @@ void LibraryInitializer::lib_close(void* handle) {
<< " loaded from: '" << libpath << "': " << dlerror();
}
#endif // _WIN32 or _WIN64 or __WINDOWS__
loaded_libs.erase(libpath);
}

/*!
Expand Down Expand Up @@ -230,9 +221,10 @@ void LibraryInitializer::install_signal_handlers() {
}

void LibraryInitializer::close_open_libs() {
for (const auto& l : loaded_libs) {
lib_close(l.second);
for (const auto& l : loaded_libs_) {
lib_close(l.second, l.first);
}
loaded_libs_.clear();
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/initialize.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class LibraryInitializer {
// Library loading
bool lib_is_loaded(const std::string& path) const;
void* lib_load(const char* path);
void lib_close(void* handle);
void lib_close(void* handle, const std::string& libpath);
static void get_sym(void* handle, void** func, char* name);

/**
Expand Down Expand Up @@ -102,7 +102,7 @@ class LibraryInitializer {

void close_open_libs();

loaded_libs_t loaded_libs;
loaded_libs_t loaded_libs_;
};

/*!
Expand Down

0 comments on commit 32cef8e

Please sign in to comment.