From 373db3de95349af29b772d7dda890406359de4ec Mon Sep 17 00:00:00 2001 From: WerWolv Date: Fri, 15 Mar 2024 17:54:09 +0100 Subject: [PATCH] fix: Potential crash on Linux when loading external libraries --- lib/libimhex/include/hex/api/plugin_manager.hpp | 2 +- lib/libimhex/source/api/plugin_manager.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libimhex/include/hex/api/plugin_manager.hpp b/lib/libimhex/include/hex/api/plugin_manager.hpp index 786431be57999..fe60109c06875 100644 --- a/lib/libimhex/include/hex/api/plugin_manager.hpp +++ b/lib/libimhex/include/hex/api/plugin_manager.hpp @@ -108,7 +108,7 @@ namespace hex { static bool load(const std::fs::path &pluginFolder); static bool loadLibraries(); - static bool loadLibraries(const std::fs::path &pluginFolder); + static bool loadLibraries(const std::fs::path &libraryFolder); static void unload(); static void reload(); diff --git a/lib/libimhex/source/api/plugin_manager.cpp b/lib/libimhex/source/api/plugin_manager.cpp index 61afac5dfff8b..e466163836824 100644 --- a/lib/libimhex/source/api/plugin_manager.cpp +++ b/lib/libimhex/source/api/plugin_manager.cpp @@ -312,9 +312,9 @@ namespace hex { return success; } - bool PluginManager::loadLibraries(const std::fs::path& pluginFolder) { + bool PluginManager::loadLibraries(const std::fs::path& libraryFolder) { bool success = true; - for (const auto &entry : std::fs::recursive_directory_iterator(pluginFolder)) { + for (const auto &entry : std::fs::directory_iterator(libraryFolder)) { if (!(entry.path().extension() == ".dll" || entry.path().extension() == ".so" || entry.path().extension() == ".dylib")) continue;