summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxim Ostapenko <m.ostapenko@partner.samsung.com>2016-09-26 08:26:23 +0000
committerMaxim Ostapenko <m.ostapenko@partner.samsung.com>2016-09-26 08:26:23 +0000
commit5b145205b5f905cf28d37e4f38ea5132e0ac8485 (patch)
tree049e9e3327ade76bc70abf2985da6abcb4308639
parentb3cf42ce5680fddf012aaf54c5a7c4da5ad7882e (diff)
downloadbcm5719-llvm-5b145205b5f905cf28d37e4f38ea5132e0ac8485.tar.gz
bcm5719-llvm-5b145205b5f905cf28d37e4f38ea5132e0ac8485.zip
[msan] Fix second parameter in MsanReallocate from previous commit.
It's wrong to pass to MsanReallocate a pointer that MSan allocator doesn't own. Use nullptr instead of ptr to prevent possible (still unlikely) failure. llvm-svn: 282390
-rw-r--r--compiler-rt/lib/msan/msan_interceptors.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler-rt/lib/msan/msan_interceptors.cc b/compiler-rt/lib/msan/msan_interceptors.cc
index 93b93aec283..53f10ab8e54 100644
--- a/compiler-rt/lib/msan/msan_interceptors.cc
+++ b/compiler-rt/lib/msan/msan_interceptors.cc
@@ -940,7 +940,7 @@ INTERCEPTOR(void *, realloc, void *ptr, SIZE_T size) {
new_ptr = AllocateFromLocalPool(copy_size);
} else {
copy_size = size;
- new_ptr = MsanReallocate(&stack, ptr, copy_size, sizeof(u64), false);
+ new_ptr = MsanReallocate(&stack, nullptr, copy_size, sizeof(u64), false);
}
internal_memcpy(new_ptr, ptr, copy_size);
return new_ptr;
OpenPOWER on IntegriCloud