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

Fixes

Browse Source
This commit is contained in:
Jeremy 2024-02-27 19:09:59 -06:00
parent a24c140baf
commit a31d35c04e
No known key found for this signature in database
GPG Key ID: 19AA8270105E8EB4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/symbols/symbols_with_dbghelp.cpp
View File

@ -345,6 +345,7 @@ namespace dbghelp {
std::fprintf(stderr, "Stack trace: Internal error while calling SymSetContext\n"); std::fprintf(stderr, "Stack trace: Internal error while calling SymSetContext\n");
return { return {
addr, addr,
0,
{ static_cast<std::uint32_t>(line.LineNumber) }, { static_cast<std::uint32_t>(line.LineNumber) },
nullable<std::uint32_t>::null(), nullable<std::uint32_t>::null(),
line.FileName, line.FileName,
@ -377,6 +378,7 @@ namespace dbghelp {
signature = std::regex_replace(signature, comma_re, ", "); signature = std::regex_replace(signature, comma_re, ", ");
return { return {
addr, addr,
0,
{ static_cast<std::uint32_t>(line.LineNumber) }, { static_cast<std::uint32_t>(line.LineNumber) },
nullable<std::uint32_t>::null(), nullable<std::uint32_t>::null(),
line.FileName, line.FileName,
@ -386,6 +388,7 @@ namespace dbghelp {
} else { } else {
return { return {
addr, addr,
0,
nullable<std::uint32_t>::null(), nullable<std::uint32_t>::null(),
nullable<std::uint32_t>::null(), nullable<std::uint32_t>::null(),
"", "",
@ -394,7 +397,7 @@ namespace dbghelp {
}; };
} }
} else { } else {
return { addr, nullable<std::uint32_t>::null(), nullable<std::uint32_t>::null(), "", "", false }; return { addr, 0, nullable<std::uint32_t>::null(), nullable<std::uint32_t>::null(), "", "", false };
} }
} }
@ -421,7 +424,7 @@ namespace dbghelp {
throw; throw;
} }
auto entry = null_frame; auto entry = null_frame;
entry.address = frame; entry.raw_address = frame;
trace.push_back(entry); trace.push_back(entry);
} }
} }

2
src/symbols/symbols_with_libdwarf.cpp
View File

@ -1006,6 +1006,7 @@ namespace libdwarf {
return { return {
{ {
frame_info.raw_address, frame_info.raw_address,
frame_info.object_address,
nullable<std::uint32_t>::null(), nullable<std::uint32_t>::null(),
nullable<std::uint32_t>::null(), nullable<std::uint32_t>::null(),
frame_info.object_path, frame_info.object_path,
@ -1100,6 +1101,7 @@ namespace libdwarf {
return { return {
{ {
frame_info.raw_address, frame_info.raw_address,
frame_info.object_address,
nullable<std::uint32_t>::null(), nullable<std::uint32_t>::null(),
nullable<std::uint32_t>::null(), nullable<std::uint32_t>::null(),
frame_info.object_path, frame_info.object_path,