diff options
author | Maxim Ostapenko <m.ostapenko@partner.samsung.com> | 2016-09-26 08:11:21 +0000 |
---|---|---|
committer | Maxim Ostapenko <m.ostapenko@partner.samsung.com> | 2016-09-26 08:11:21 +0000 |
commit | c8a185bc3169b0a6d2cd8beedc77033461830037 (patch) | |
tree | 1eb62ef310fefffe62a364a66cbc5483d5d3549d /lib/msan | |
parent | 19087aaf88d7fceee9e5a235da41431d35fb570e (diff) | |
download | compiler-rt-c8a185bc3169b0a6d2cd8beedc77033461830037.tar.gz |
[asan, msan] Fix reallocation logic when IsInDlsymAllocPool(ptr) is true.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@282389 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/msan')
-rw-r--r-- | lib/msan/msan_interceptors.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/msan/msan_interceptors.cc b/lib/msan/msan_interceptors.cc index 2aeaef49e..93b93aec2 100644 --- a/lib/msan/msan_interceptors.cc +++ b/lib/msan/msan_interceptors.cc @@ -935,7 +935,13 @@ INTERCEPTOR(void *, realloc, void *ptr, SIZE_T size) { if (UNLIKELY(IsInDlsymAllocPool(ptr))) { uptr offset = (uptr)ptr - (uptr)alloc_memory_for_dlsym; uptr copy_size = Min(size, kDlsymAllocPoolSize - offset); - void *new_ptr = AllocateFromLocalPool(size); + void *new_ptr; + if (UNLIKELY(!msan_inited)) { + new_ptr = AllocateFromLocalPool(copy_size); + } else { + copy_size = size; + new_ptr = MsanReallocate(&stack, ptr, copy_size, sizeof(u64), false); + } internal_memcpy(new_ptr, ptr, copy_size); return new_ptr; } |