shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

[sanitizer] Fix strlcpy and strlcat interceptors on Darwin

Browse Source 
llvm-svn: 328414
This commit is contained in:
Vitaly Buka 2018-03-24 07:31:59 +00:00
parent c0e1880db9
commit eb8a3674ec
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
View File

@ -6856,8 +6856,8 @@ INTERCEPTOR(SIZE_T, strlcpy, char *dst, char *src, SIZE_T size) {
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, char *src, SIZE_T size) {
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