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

Fix for addr2line edge case

Browse Source
This commit is contained in:
Jeremy 2023-07-24 18:48:52 -04:00
parent 9d52dc24e2
commit d589f2a609
No known key found for this signature in database
GPG Key ID: 19AA8270105E8EB4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/symbols/symbols_with_addr2line.cpp
View File

@ -335,6 +335,7 @@ namespace cpptrace {
// The path may be ?? if addr2line cannot resolve, line may be ? // The path may be ?? if addr2line cannot resolve, line may be ?
// Edge cases: // Edge cases:
// ?? ??:0 // ?? ??:0
// symbol :?
const std::size_t at_location = line.find(" at "); const std::size_t at_location = line.find(" at ");
std::size_t symbol_end; std::size_t symbol_end;
std::size_t filename_start; std::size_t filename_start;
@ -349,13 +350,13 @@ namespace cpptrace {
auto symbol = line.substr(0, symbol_end); auto symbol = line.substr(0, symbol_end);
auto colon = line.rfind(':'); auto colon = line.rfind(':');
internal_verify(colon != std::string::npos); internal_verify(colon != std::string::npos);
internal_verify(colon > filename_start); internal_verify(colon >= filename_start); // :? to deal with "symbol :?" edge case
auto filename = line.substr(filename_start, colon - filename_start); auto filename = line.substr(filename_start, colon - filename_start);
auto line_number = line.substr(colon + 1); auto line_number = line.substr(colon + 1);
if(line_number != "?") { if(line_number != "?") {
entries_vec[entry_index].second.get().line = std::stoi(line_number); entries_vec[entry_index].second.get().line = std::stoi(line_number);
} }
if(filename != "??") { if(!filename.empty() && filename != "??") {
entries_vec[entry_index].second.get().filename = filename; entries_vec[entry_index].second.get().filename = filename;
} }
if(!symbol.empty()) { if(!symbol.empty()) {