Index: compiler-rt/trunk/lib/interception/interception_linux.cc =================================================================== --- compiler-rt/trunk/lib/interception/interception_linux.cc +++ compiler-rt/trunk/lib/interception/interception_linux.cc @@ -33,7 +33,7 @@ } #endif -static void *GetFuncAddr(const char *name) { +static void *GetFuncAddr(const char *name, uptr wrapper_addr) { #if SANITIZER_NETBSD // FIXME: Find a better way to handle renames if (StrCmp(name, "sigaction")) @@ -47,13 +47,18 @@ // want the address of the real definition, though, so look it up using // RTLD_DEFAULT. addr = dlsym(RTLD_DEFAULT, name); + + // In case `name' is not loaded, dlsym ends up finding the actual wrapper. + // We don't want to intercept the wrapper and have it point to itself. + if ((uptr)addr == wrapper_addr) + addr = nullptr; } return addr; } bool InterceptFunction(const char *name, uptr *ptr_to_real, uptr func, uptr wrapper) { - void *addr = GetFuncAddr(name); + void *addr = GetFuncAddr(name, wrapper); *ptr_to_real = (uptr)addr; return addr && (func == wrapper); } Index: compiler-rt/trunk/test/asan/TestCases/Linux/dlopen-mixed-c-cxx.c =================================================================== --- compiler-rt/trunk/test/asan/TestCases/Linux/dlopen-mixed-c-cxx.c +++ compiler-rt/trunk/test/asan/TestCases/Linux/dlopen-mixed-c-cxx.c @@ -0,0 +1,42 @@ +// RUN: %clangxx_asan -xc++ -shared -fPIC -o %t.so - < %s +// RUN: %clang_asan %s -o %t.out -ldl +// RUN: ASAN_OPTIONS=verbosity=1 not %t.out %t.so 2>&1 | FileCheck %s +// +// CHECK: AddressSanitizer: failed to intercept '__cxa_throw' +// +// dlopen() can not be intercepted on Android +// UNSUPPORTED: android +#ifdef __cplusplus + +static void foo(void) { + int i = 0; + throw(i); +} + +extern "C" { +int bar(void); +}; +int bar(void) { + try { + foo(); + } catch (int i) { + return i; + } + return -1; +} + +#else + +#include +#include + +int main(int argc, char **argv) { + int (*bar)(void); + void *handle = dlopen(argv[1], RTLD_LAZY); + assert(handle); + bar = dlsym(handle, "bar"); + assert(bar); + return bar(); +} + +#endif