Skip to content

Fix some warnings on MSVC #201

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
merged 1 commit into from
Jan 11, 2025
Merged

Fix some warnings on MSVC #201

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
12 changes: 6 additions & 6 deletions include/boost/stacktrace/detail/addr_base_msvc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,27 +36,27 @@ namespace boost { namespace stacktrace { namespace detail {
HMODULE* modules = modules_stack;

DWORD needed_bytes = 0;
uintptr_t addr_base = 0;
std::uintptr_t addr_base = 0;

HANDLE process_handle = GetCurrentProcess();
bool enum_process_result = EnumProcessModules(process_handle, modules, sizeof(modules), &needed_bytes);
auto enum_process_is_ok = EnumProcessModules(process_handle, modules, sizeof(modules), &needed_bytes);

// Check if the error is because the buffer is too small.
if (!enum_process_result && GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
if (!enum_process_is_ok && GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
modules_allocated.reset(new HMODULE[needed_bytes / sizeof(HMODULE)]);
modules = modules_allocated.get();
enum_process_result = EnumProcessModules(process_handle, modules, needed_bytes, &needed_bytes);
enum_process_is_ok = EnumProcessModules(process_handle, modules, needed_bytes, &needed_bytes);
}

if (enum_process_result) {
if (enum_process_is_ok) {
for (std::size_t i = 0; i < (needed_bytes / sizeof(HMODULE)); ++i) {
MODULEINFO module_info;

// Get the module name
if (GetModuleInformation(process_handle, modules[i], &module_info, sizeof(module_info))
&& module_info.lpBaseOfDll <= addr && addr < LPBYTE(module_info.lpBaseOfDll) + module_info.SizeOfImage) {
// Module contains the address
addr_base = reinterpret_cast<std::uintptr_t>(module_info.lpBaseOfDll);
addr_base = reinterpret_cast<std::uintptr_t>(module_info.lpBaseOfDll);
break;
}
}
Expand Down
Loading