diff options
| author | Kostya Serebryany <kcc@google.com> | 2013-11-15 10:31:14 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@gcc.gnu.org> | 2013-11-15 10:31:14 +0000 |
| commit | c8e1377bf99a81141b2216e7826ea69978968627 (patch) | |
| tree | 55a8a644f67e68d67a602e8ebb34bdfcf419c187 | |
| parent | d1c369c21eea6b7d8689de72dad6c2cb6fee1c51 (diff) | |
| download | gcc-c8e1377bf99a81141b2216e7826ea69978968627.zip gcc-c8e1377bf99a81141b2216e7826ea69978968627.tar.gz gcc-c8e1377bf99a81141b2216e7826ea69978968627.tar.bz2 | |
fix PR sanitizer/58994
From-SVN: r204838
| -rw-r--r-- | libsanitizer/ChangeLog | 8 | ||||
| -rw-r--r-- | libsanitizer/asan/asan_interceptors.cc | 16 |
2 files changed, 18 insertions, 6 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 47f93db..a0a8a8e 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,11 @@ +2013-11-15 Kostya Serebryany <kcc@google.com> + + PR sanitizer/58994 + Backport from upstream revision 194573 + * asan/asan_interceptors.cc (COMMON_INTERCEPTOR_ENTER): Fall + back to the original functions in the common libsanitizer + interceptors and the __cxa_atexit() interceptor on Darwin. + 2013-11-13 Peter Bergner <bergner@vnet.ibm.com> PR sanitizer/59009 diff --git a/libsanitizer/asan/asan_interceptors.cc b/libsanitizer/asan/asan_interceptors.cc index 6fa968d..72f7aae 100644 --- a/libsanitizer/asan/asan_interceptors.cc +++ b/libsanitizer/asan/asan_interceptors.cc @@ -106,12 +106,13 @@ DECLARE_REAL_AND_INTERCEPTOR(void, free, void *) #define COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ptr, size) \ ASAN_WRITE_RANGE(ptr, size) #define COMMON_INTERCEPTOR_READ_RANGE(ctx, ptr, size) ASAN_READ_RANGE(ptr, size) -#define COMMON_INTERCEPTOR_ENTER(ctx, func, ...) \ - do { \ - if (asan_init_is_running) return REAL(func)(__VA_ARGS__); \ - ctx = 0; \ - (void) ctx; \ - ENSURE_ASAN_INITED(); \ +#define COMMON_INTERCEPTOR_ENTER(ctx, func, ...) \ + do { \ + if (asan_init_is_running) return REAL(func)(__VA_ARGS__); \ + ctx = 0; \ + (void) ctx; \ + if (SANITIZER_MAC && !asan_inited) return REAL(func)(__VA_ARGS__); \ + ENSURE_ASAN_INITED(); \ } while (false) #define COMMON_INTERCEPTOR_FD_ACQUIRE(ctx, fd) \ do { \ @@ -634,6 +635,9 @@ static void AtCxaAtexit(void *unused) { #if ASAN_INTERCEPT___CXA_ATEXIT INTERCEPTOR(int, __cxa_atexit, void (*func)(void *), void *arg, void *dso_handle) { +#if SANITIZER_MAC + if (!asan_inited) return REAL(__cxa_atexit)(func, arg, dso_handle); +#endif ENSURE_ASAN_INITED(); int res = REAL(__cxa_atexit)(func, arg, dso_handle); REAL(__cxa_atexit)(AtCxaAtexit, 0, 0); |