Skip to content
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

fix: Make Windows ModuleFinder more resilient to missing Debug Info #732

Merged
merged 2 commits into from
Jul 1, 2022
Merged

fix: Make Windows ModuleFinder more resilient to missing Debug Info #732

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b273bfa
fix: Make Windows ModuleFinder more resilient to missing Debug Info
Swatinem Jun 30, 2022
e0ee3e1
Merge remote-tracking branch 'origin/master' into fix/winmoddebug
Swatinem Jul 1, 2022
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
15 changes: 8 additions & 7 deletions src/modulefinder/sentry_modulefinder_windows.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ extract_pdb_info(uintptr_t module_addr, sentry_value_t module)
return;
}

char id_buf[50];
snprintf(id_buf, sizeof(id_buf), "%08x%X",
nt_headers->FileHeader.TimeDateStamp,
nt_headers->OptionalHeader.SizeOfImage);
sentry_value_set_by_key(module, "code_id", sentry_value_new_string(id_buf));

uint32_t relative_addr
= nt_headers->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG]
.VirtualAddress;
Expand All @@ -63,18 +69,11 @@ extract_pdb_info(uintptr_t module_addr, sentry_value_t module)

sentry_uuid_t debug_id_base
= sentry__uuid_from_native(&debug_info->pdb_signature);
char id_buf[50];
sentry_uuid_as_string(&debug_id_base, id_buf);
id_buf[36] = '-';
snprintf(id_buf + 37, 10, "%x", debug_info->pdb_age);
sentry_value_set_by_key(
module, "debug_id", sentry_value_new_string(id_buf));

snprintf(id_buf, sizeof(id_buf), "%08x%X",
nt_headers->FileHeader.TimeDateStamp,
nt_headers->OptionalHeader.SizeOfImage);
sentry_value_set_by_key(module, "code_id", sentry_value_new_string(id_buf));
sentry_value_set_by_key(module, "type", sentry_value_new_string("pe"));
}

static void
Expand All @@ -97,6 +96,8 @@ load_modules(void)
module.modBaseAddr, &vmem_info, sizeof(vmem_info))
&& vmem_info.State == MEM_COMMIT) {
sentry_value_t rv = sentry_value_new_object();
sentry_value_set_by_key(
rv, "type", sentry_value_new_string("pe"));
sentry_value_set_by_key(rv, "image_addr",
sentry__value_new_addr((uint64_t)module.modBaseAddr));
sentry_value_set_by_key(rv, "image_size",
Expand Down