[compiler-rt] r282390 - [msan] Fix second parameter in MsanReallocate from previous commit.

Maxim Ostapenko via llvm-commits llvm-commits at lists.llvm.org
Mon Sep 26 01:26:24 PDT 2016


Author: chefmax
Date: Mon Sep 26 03:26:23 2016
New Revision: 282390

URL: http://llvm.org/viewvc/llvm-project?rev=282390&view=rev
Log:
[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.

Modified:
    compiler-rt/trunk/lib/msan/msan_interceptors.cc

Modified: compiler-rt/trunk/lib/msan/msan_interceptors.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/msan_interceptors.cc?rev=282390&r1=282389&r2=282390&view=diff
==============================================================================
--- compiler-rt/trunk/lib/msan/msan_interceptors.cc (original)
+++ compiler-rt/trunk/lib/msan/msan_interceptors.cc Mon Sep 26 03:26:23 2016
@@ -940,7 +940,7 @@ INTERCEPTOR(void *, realloc, void *ptr,
       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;




More information about the llvm-commits mailing list