Skip to content

Pin the host module instead of wrapping a borrowed HMODULE #147

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

Open
JustinMDotNet wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Pin the host module instead of wrapping a borrowed HMODULE #147

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
11 changes: 10 additions & 1 deletion src/dll/Systems/PluginSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,16 @@ void PluginSystem::Load(const std::filesystem::path& aPath, bool aUseAlteredSear

wil::unique_hmodule handle;
if (aPath.extension() == L".exe")
handle.reset(GetModuleHandleA(nullptr));
{
// GetModuleHandle returns a borrowed handle that must not be passed to FreeLibrary, but
// PluginBase stores the handle in another wil::unique_hmodule. Pin the host module so the
// eventual FreeLibrary call is a documented no-op and the loader refcount stays balanced.
HMODULE raw = nullptr;
if (GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_PIN, nullptr, &raw))
{
handle.reset(raw);
}
}
else
handle.reset(LoadLibraryEx(aPath.c_str(), nullptr, flags));

Expand Down