nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

... and fix the linux backtrace_symbols{,_fd} calls

Browse Source
This commit is contained in:
Nick Mathewson 2015-12-16 08:20:53 -05:00
parent 6ba8afe5f8
commit c4df0c9f52
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/backtrace.c
View File

@ -96,7 +96,7 @@ log_backtrace(int severity, int domain, const char *msg)
tor_mutex_acquire(&cb_buf_mutex); tor_mutex_acquire(&cb_buf_mutex);
depth = backtrace(cb_buf, MAX_DEPTH); depth = backtrace(cb_buf, MAX_DEPTH);
symbols = backtrace_symbols(cb_buf, depth); symbols = backtrace_symbols(cb_buf, (int)depth);
tor_log(severity, domain, "%s. Stack trace:", msg); tor_log(severity, domain, "%s. Stack trace:", msg);
if (!symbols) { if (!symbols) {
@ -139,7 +139,7 @@ crash_handler(int sig, siginfo_t *si, void *ctx_)
n_fds = tor_log_get_sigsafe_err_fds(&fds); n_fds = tor_log_get_sigsafe_err_fds(&fds);
for (i=0; i < n_fds; ++i) for (i=0; i < n_fds; ++i)
backtrace_symbols_fd(cb_buf, depth, fds[i]); backtrace_symbols_fd(cb_buf, (int)depth, fds[i]);
abort(); abort();
} }
@ -175,7 +175,7 @@ install_bt_handler(void)
* reads won't be denied by the sandbox code */ * reads won't be denied by the sandbox code */
char **symbols; char **symbols;
size_t depth = backtrace(cb_buf, MAX_DEPTH); size_t depth = backtrace(cb_buf, MAX_DEPTH);
symbols = backtrace_symbols(cb_buf, depth); symbols = backtrace_symbols(cb_buf, (int) depth);
if (symbols) if (symbols)
free(symbols); free(symbols);
} }