[compiler-rt] r328414 - [sanitizer] Fix strlcpy and strlcat interceptors on Darwin

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Sat Mar 24 00:31:59 2018
New Revision: 328414

URL: http://llvm.org/viewvc/llvm-project?rev=328414&view=rev
Log:
[sanitizer] Fix strlcpy and strlcat interceptors on Darwin

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc?rev=328414&r1=328413&r2=328414&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc Sat Mar 24 00:31:59 2018
@@ -6856,8 +6856,8 @@ INTERCEPTOR(SIZE_T, strlcpy, char *dst,
   COMMON_INTERCEPTOR_ENTER(ctx, strlcpy, dst, src, size);
   if (src) {
     // Keep strnlen as macro argument, as macro may ignore it.
-    COMMON_INTERCEPTOR_READ_STRING(ctx, src,
-      Min(REAL(strnlen)(src, size), size - 1) + 1);
+    COMMON_INTERCEPTOR_READ_STRING(
+        ctx, src, Min(internal_strnlen(src, size), size - 1) + 1);
   }
   res = REAL(strlcpy)(dst, src, size);
   COMMON_INTERCEPTOR_COPY_STRING(ctx, dst, src, REAL(strlen)(dst) + 1);
@@ -6870,7 +6870,7 @@ INTERCEPTOR(SIZE_T, strlcat, char *dst,
   COMMON_INTERCEPTOR_ENTER(ctx, strlcat, dst, src, size);
   // src is checked in the strlcpy() interceptor
   if (dst) {
-    len = REAL(strnlen)(dst, size);
+    len = internal_strnlen(dst, size);
     COMMON_INTERCEPTOR_READ_STRING(ctx, dst, Min(len, size - 1) + 1);
   }
   // Reuse the rest of the code in the strlcpy() interceptor