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

Jump to bottom

stacktrace: Remove dangerous value access #29

Merged
merged 1 commit into from
Sep 3, 2023
Merged

stacktrace: Remove dangerous value access #29

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
22 changes: 12 additions & 10 deletions src/stacktrace.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,23 +95,25 @@ static void print_backtrace_symbol(int count, void *addr)
char *symbol;
int offset;
int status;

// dladdr() translates address to symbolic info.
dladdr(addr, &dlip);
int dl_ret;
int len = SYMBOL_MAXLEN;

#if __SIZEOF_LONG__ == 4
pr_out("%2d [%#10lx] ", count, (unsigned long)addr);
#else
pr_out("%2d [%#14lx] ", count, (unsigned long)addr);
#endif
// dladdr() translates address to symbolic info.
dl_ret = dladdr(addr, &dlip);
if (dl_ret == 0) {
pr_out("?\n");
return;
}

symbol = abi::__cxa_demangle(dlip.dli_sname, nullptr, nullptr, &status);

if (status == -2 && !symbol)
symbol = strdup(dlip.dli_sname);

if (symbol) {
int len = SYMBOL_MAXLEN;
if (dlip.dli_sname != nullptr && dlip.dli_saddr != nullptr) {
symbol = abi::__cxa_demangle(dlip.dli_sname, nullptr, nullptr, &status);
if (status != 0)
symbol = strdup(dlip.dli_sname);

if (strlen(symbol) > len) {
symbol[len - 3] = '.';
Expand Down