[llvm-commits] [compiler-rt] r160171 - /compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc

[Kostya Serebryany]

Author: kcc
Date: Fri Jul 13 08:04:43 2012
New Revision: 160171

URL: http://llvm.org/viewvc/llvm-project?rev=160171&view=rev
Log:
[tsan] use internal_strnlen in strncpy interceptor (the bug found while booting chromium)

Modified:
    compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc?rev=160171&r1=160170&r2=160171&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc Fri Jul 13 08:04:43 2012
@@ -476,7 +476,7 @@
 
 TSAN_INTERCEPTOR(char*, strncpy, char *dst, char *src, uptr n) {
   SCOPED_TSAN_INTERCEPTOR(strncpy, dst, src, n);
-  uptr srclen = internal_strlen(src);
+  uptr srclen = internal_strnlen(src, n);
   MemoryAccessRange(thr, pc, (uptr)dst, n, true);
   MemoryAccessRange(thr, pc, (uptr)src, min(srclen + 1, n), false);
   return REAL(strncpy)(dst, src, n);