diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/asan/asan_malloc_linux.cc | 8 | ||||
| -rw-r--r-- | lib/msan/msan_interceptors.cc | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/lib/asan/asan_malloc_linux.cc b/lib/asan/asan_malloc_linux.cc index d7a22d683..a78767c19 100644 --- a/lib/asan/asan_malloc_linux.cc +++ b/lib/asan/asan_malloc_linux.cc @@ -79,10 +79,12 @@ INTERCEPTOR(void*, realloc, void *ptr, uptr size) { uptr offset = (uptr)ptr - (uptr)alloc_memory_for_dlsym; uptr copy_size = Min(size, kDlsymAllocPoolSize - offset); void *new_ptr; - if (UNLIKELY(!asan_inited)) + if (UNLIKELY(!asan_inited)) { new_ptr = AllocateFromLocalPool(size); - else - new_ptr = asan_malloc(size, &stack); + } else { + copy_size = size; + new_ptr = asan_malloc(copy_size, &stack); + } internal_memcpy(new_ptr, ptr, copy_size); return new_ptr; } 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; } |