[compiler-rt] r310244 - [asan] Return sizeof missed by r309914

[Kuba Mracek via llvm-commits]

Please merge into relase_50.

How "open" is the release_50 branch?  Can I just merge important commits directly, or should I always CC Hans?

Thanks!
Kuba

> On 7 Aug 2017, at 02:08, Vitaly Buka via llvm-commits <llvm-commits at lists.llvm.org> wrote:
> 
> Author: vitalybuka
> Date: Mon Aug  7 02:08:44 2017
> New Revision: 310244
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=310244&view=rev
> Log:
> [asan] Return sizeof missed by r309914
> 
> Modified:
>    compiler-rt/trunk/lib/asan/asan_malloc_linux.cc
> 
> Modified: compiler-rt/trunk/lib/asan/asan_malloc_linux.cc
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_malloc_linux.cc?rev=310244&r1=310243&r2=310244&view=diff
> ==============================================================================
> --- compiler-rt/trunk/lib/asan/asan_malloc_linux.cc (original)
> +++ compiler-rt/trunk/lib/asan/asan_malloc_linux.cc Mon Aug  7 02:08:44 2017
> @@ -32,7 +32,7 @@ static uptr alloc_memory_for_dlsym[kDlsy
> 
> static INLINE bool IsInDlsymAllocPool(const void *ptr) {
>   uptr off = (uptr)ptr - (uptr)alloc_memory_for_dlsym;
> -  return off < allocated_for_dlsym;
> +  return off < sizeof(alloc_memory_for_dlsym);
> }
> 
> static void *AllocateFromLocalPool(uptr size_in_bytes) {
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits