luo980/cpptrace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't print internal errors when image base resolution fails, this can happen on mac since platform dylibs don't actually exist on disk. Closes #217.

Browse Source
This commit is contained in:
Jeremy Rifkin 2025-02-22 13:20:03 -06:00
parent 6cec10601e
commit a32e22aa44
No known key found for this signature in database
GPG Key ID: 19AA8270105E8EB4
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/binary/object.cpp
View File

@ -78,7 +78,9 @@ namespace detail {
- reinterpret_cast<std::uintptr_t>(info.dli_fbase) - reinterpret_cast<std::uintptr_t>(info.dli_fbase)
+ base.unwrap_value(); + base.unwrap_value();
} else { } else {
base.drop_error(); if(!should_absorb_trace_exceptions()) {
base.drop_error();
}
} }
} }
return frame; return frame;
@ -101,7 +103,9 @@ namespace detail {
- reinterpret_cast<std::uintptr_t>(info.dli_fbase) - reinterpret_cast<std::uintptr_t>(info.dli_fbase)
+ base.unwrap_value(); + base.unwrap_value();
} else { } else {
base.drop_error(); if(!should_absorb_trace_exceptions()) {
base.drop_error();
}
} }
} }
return frame; return frame;
@ -146,7 +150,9 @@ namespace detail {
- reinterpret_cast<std::uintptr_t>(handle) - reinterpret_cast<std::uintptr_t>(handle)
+ base.unwrap_value(); + base.unwrap_value();
} else { } else {
base.drop_error(); if(!should_absorb_trace_exceptions()) {
base.drop_error();
}
} }
} else { } else {
std::fprintf(stderr, "%s\n", std::system_error(GetLastError(), std::system_category()).what()); std::fprintf(stderr, "%s\n", std::system_error(GetLastError(), std::system_category()).what());

2
src/symbols/symbols_core.cpp
View File

@ -83,6 +83,8 @@ namespace detail {
} }
} }
// TODO: Symbol resolution code should probably handle when object addresses are 0
std::vector<stacktrace_frame> resolve_frames(const std::vector<object_frame>& frames) { std::vector<stacktrace_frame> resolve_frames(const std::vector<object_frame>& frames) {
#if defined(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF) && defined(CPPTRACE_GET_SYMBOLS_WITH_DBGHELP) #if defined(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF) && defined(CPPTRACE_GET_SYMBOLS_WITH_DBGHELP)
std::vector<stacktrace_frame> trace = libdwarf::resolve_frames(frames); std::vector<stacktrace_frame> trace = libdwarf::resolve_frames(frames);