diff options
| author | Alexander Potapenko <glider@google.com> | 2012-09-10 08:35:12 +0000 |
|---|---|---|
| committer | Alexander Potapenko <glider@google.com> | 2012-09-10 08:35:12 +0000 |
| commit | 8d6e3f7d011970e35dadf831964260bcf6a4d8a9 (patch) | |
| tree | 4be1d8336fbb9e96765ec80117fe7f5762a1dad3 /lib | |
| parent | 5b36c14401009924adc6088e3289effdb7ee6555 (diff) | |
Allow to call strchr() from __asan_init().
Fixes PR13794.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@163493 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/asan/asan_interceptors.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/asan/asan_interceptors.cc b/lib/asan/asan_interceptors.cc index db0e00bdf..900bf5ac8 100644 --- a/lib/asan/asan_interceptors.cc +++ b/lib/asan/asan_interceptors.cc @@ -271,6 +271,11 @@ INTERCEPTOR(char*, strchr, const char *str, int c) { #if MAC_INTERPOSE_FUNCTIONS if (!asan_inited) return REAL(strchr)(str, c); #endif + // strchr is called inside create_purgeable_zone() when MallocGuardEdges=1 is + // used. + if (asan_init_is_running) { + return REAL(strchr)(str, c); + } ENSURE_ASAN_INITED(); char *result = REAL(strchr)(str, c); if (flags()->replace_str) { |