Skip to content

src: fix bugs and refactor NativeSymbolDebuggingContext::GetLoadedLibraries #57738

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
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

src: fix bugs and refactor NativeSymbolDebuggingContext::GetLoadedLibraries #57738

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
48d4baa
src: fix module buffer allocation
Whitecx Apr 3, 2025
0f261b5
src: Replace GetModuleFileNameExW with GetModuleFileNameW
Whitecx Apr 3, 2025
6584451
src: fix GetModuleFileName param
Whitecx Apr 3, 2025
80624e0
src: fix memory leak from string conversion
Whitecx Apr 3, 2025
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
9 changes: 4 additions & 5 deletions src/debug_utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ std::vector<std::string> NativeSymbolDebuggingContext::GetLoadedLibraries() {
DWORD size_2 = 0;
// First call to get the size of module array needed
if (EnumProcessModules(process_handle, nullptr, 0, &size_1)) {
MallocedBuffer<HMODULE> modules(size_1);
MallocedBuffer<HMODULE> modules(size_1 / sizeof(HMODULE));

// Second call to populate the module array
if (EnumProcessModules(process_handle, modules.data, size_1, &size_2)) {
Expand All @@ -480,16 +480,15 @@ std::vector<std::string> NativeSymbolDebuggingContext::GetLoadedLibraries() {
i++) {
WCHAR module_name[MAX_PATH];
// Obtain and report the full pathname for each module
if (GetModuleFileNameExW(process_handle,
modules.data[i],
module_name,
arraysize(module_name) / sizeof(WCHAR))) {
if (GetModuleFileNameW(
modules.data[i], module_name, arraysize(module_name))) {
DWORD size = WideCharToMultiByte(
CP_UTF8, 0, module_name, -1, nullptr, 0, nullptr, nullptr);
char* str = new char[size];
WideCharToMultiByte(
CP_UTF8, 0, module_name, -1, str, size, nullptr, nullptr);
list.emplace_back(str);
delete str;
}
}
}
Expand Down
Loading