forked from OSchip/llvm-project
Fix/workaround for OS X truncated stacktraces taken by external tools
This patch is a proposed solution for https://code.google.com/p/address-sanitizer/issues/detail?id=375: When the stacktraces are captured and printed by ASan itself, they are fine, but when the program has already printed the report (or is just printing it), capturing a stacktrace via other means is broken. "Other means" include OS X CrashReporter, debuggers or calling backtrace() within the program. For example calling backtrace() from a sanitizer_set_death_callback function prints a very truncated stacktrace. Reviewed at http://reviews.llvm.org/D7103 llvm-svn: 226878
This commit is contained in:
parent
495523e4ea
commit
405de4ae10
|
@ -374,13 +374,6 @@ void dispatch_source_set_event_handler(dispatch_source_t ds, void(^work)(void));
|
|||
work(); \
|
||||
}
|
||||
|
||||
// Forces the compiler to generate a frame pointer in the function.
|
||||
#define ENABLE_FRAME_POINTER \
|
||||
do { \
|
||||
volatile uptr enable_fp; \
|
||||
enable_fp = GET_CURRENT_FRAME(); \
|
||||
} while (0)
|
||||
|
||||
INTERCEPTOR(void, dispatch_async,
|
||||
dispatch_queue_t dq, void(^work)(void)) {
|
||||
ENABLE_FRAME_POINTER;
|
||||
|
|
|
@ -937,6 +937,8 @@ using namespace __asan; // NOLINT
|
|||
|
||||
void __asan_report_error(uptr pc, uptr bp, uptr sp, uptr addr, int is_write,
|
||||
uptr access_size) {
|
||||
ENABLE_FRAME_POINTER;
|
||||
|
||||
// Determine the error type.
|
||||
const char *bug_descr = "unknown-crash";
|
||||
if (AddrIsInMem(addr)) {
|
||||
|
|
|
@ -325,4 +325,11 @@ extern "C" void* _ReturnAddress(void);
|
|||
} while (internal_iserror(res, &rverrno) && rverrno == EINTR); \
|
||||
}
|
||||
|
||||
// Forces the compiler to generate a frame pointer in the function.
|
||||
#define ENABLE_FRAME_POINTER \
|
||||
do { \
|
||||
volatile uptr enable_fp; \
|
||||
enable_fp = GET_CURRENT_FRAME(); \
|
||||
} while (0)
|
||||
|
||||
#endif // SANITIZER_DEFS_H
|
||||
|
|
|
@ -0,0 +1,43 @@
|
|||
// RUN: %clang_asan -O0 %s -o %t
|
||||
// RUN: not %run %t 2>&1 | FileCheck %s
|
||||
|
||||
#include <execinfo.h>
|
||||
#include <sanitizer/common_interface_defs.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
void death_function() {
|
||||
fprintf(stderr, "DEATH CALLBACK\n");
|
||||
|
||||
void* callstack[128];
|
||||
int i, frames = backtrace(callstack, 128);
|
||||
char** strs = backtrace_symbols(callstack, frames);
|
||||
for (i = 0; i < frames; ++i) {
|
||||
fprintf(stderr, "%s\n", strs[i]);
|
||||
}
|
||||
free(strs);
|
||||
|
||||
fprintf(stderr, "END OF BACKTRACE\n");
|
||||
}
|
||||
|
||||
int fault_function() {
|
||||
char *x = (char*)malloc(10 * sizeof(char));
|
||||
free(x);
|
||||
return x[5]; // BOOM
|
||||
}
|
||||
|
||||
int main() {
|
||||
__sanitizer_set_death_callback(death_function);
|
||||
fault_function();
|
||||
return 0;
|
||||
}
|
||||
|
||||
// CHECK: {{.*ERROR: AddressSanitizer: heap-use-after-free on address}}
|
||||
// CHECK: {{READ of size 1 at 0x.* thread T0}}
|
||||
// CHECK: {{ #0 0x.* in fault_function}}
|
||||
|
||||
// CHECK: DEATH CALLBACK
|
||||
// CHECK: death_function
|
||||
// CHECK: fault_function
|
||||
// CHECK: main
|
||||
// CHECK: END OF BACKTRACE
|
Loading…
Reference in New Issue