diff options
author | Alexey Samsonov <samsonov@google.com> | 2013-07-12 11:59:58 +0000 |
---|---|---|
committer | Alexey Samsonov <samsonov@google.com> | 2013-07-12 11:59:58 +0000 |
commit | e43d2108ec7622afb34b8281005a12fcdb26d6fa (patch) | |
tree | db80b178557ee75a6b44a91fef1d8a1034d0c7cb /lib/sanitizer_common/sanitizer_common_interceptors.inc | |
parent | 5a482cd54a75bf821fb8c61f2fe4e84ae9efb714 (diff) | |
download | compiler-rt-e43d2108ec7622afb34b8281005a12fcdb26d6fa.tar.gz compiler-rt-e43d2108ec7622afb34b8281005a12fcdb26d6fa.tar.bz2 compiler-rt-e43d2108ec7622afb34b8281005a12fcdb26d6fa.tar.xz |
[Sanitizer] Revert some parts of r186109 related to mbstowcs-and-friends interceptors
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@186155 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/sanitizer_common/sanitizer_common_interceptors.inc')
-rw-r--r-- | lib/sanitizer_common/sanitizer_common_interceptors.inc | 56 |
1 files changed, 34 insertions, 22 deletions
diff --git a/lib/sanitizer_common/sanitizer_common_interceptors.inc b/lib/sanitizer_common/sanitizer_common_interceptors.inc index 329ff2c3..d9c6fc24 100644 --- a/lib/sanitizer_common/sanitizer_common_interceptors.inc +++ b/lib/sanitizer_common/sanitizer_common_interceptors.inc @@ -1540,8 +1540,10 @@ INTERCEPTOR(SIZE_T, mbstowcs, wchar_t *dest, const char *src, SIZE_T len) { void *ctx; COMMON_INTERCEPTOR_ENTER(ctx, mbstowcs, dest, src, len); SIZE_T res = REAL(mbstowcs)(dest, src, len); - if (res != (SIZE_T) - 1 && dest) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dest, (res + 1) * sizeof(wchar_t)); + if (res != (SIZE_T)-1 && dest) { + SIZE_T write_cnt = res + (res < len); + COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dest, write_cnt * sizeof(wchar_t)); + } return res; } @@ -1549,12 +1551,13 @@ INTERCEPTOR(SIZE_T, mbsrtowcs, wchar_t *dest, const char **src, SIZE_T len, void *ps) { void *ctx; COMMON_INTERCEPTOR_ENTER(ctx, mbsrtowcs, dest, src, len, ps); - if (src) { - COMMON_INTERCEPTOR_READ_RANGE(ctx, src, sizeof(*src)); - } + COMMON_INTERCEPTOR_READ_RANGE(ctx, src, sizeof(*src)); SIZE_T res = REAL(mbsrtowcs)(dest, src, len, ps); - if (res != (SIZE_T) - 1 && dest) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dest, (res + 1) * sizeof(wchar_t)); + if (res != (SIZE_T)-1 && dest) { + // Terminating '\0' is not printed iff *src is cleared. + SIZE_T write_cnt = res + !(*src); + COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dest, write_cnt * sizeof(wchar_t)); + } return res; } @@ -1570,13 +1573,16 @@ INTERCEPTOR(SIZE_T, mbsnrtowcs, wchar_t *dest, const char **src, SIZE_T nms, SIZE_T len, void *ps) { void *ctx; COMMON_INTERCEPTOR_ENTER(ctx, mbsnrtowcs, dest, src, nms, len, ps); - if (src) { + if (nms) { + COMMON_INTERCEPTOR_READ_RANGE(ctx, *src, nms); COMMON_INTERCEPTOR_READ_RANGE(ctx, src, sizeof(*src)); - if (nms) COMMON_INTERCEPTOR_READ_RANGE(ctx, *src, nms); } SIZE_T res = REAL(mbsnrtowcs)(dest, src, nms, len, ps); - if (res != (SIZE_T) - 1 && dest) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dest, (res + 1) * sizeof(wchar_t)); + if (res != (SIZE_T)-1 && dest && nms) { + // Terminating '\0' is not printed iff *src is cleared. + SIZE_T write_cnt = res + !(*src); + COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dest, write_cnt * sizeof(wchar_t)); + } return res; } @@ -1590,8 +1596,10 @@ INTERCEPTOR(SIZE_T, wcstombs, char *dest, const wchar_t *src, SIZE_T len) { void *ctx; COMMON_INTERCEPTOR_ENTER(ctx, wcstombs, dest, src, len); SIZE_T res = REAL(wcstombs)(dest, src, len); - if (res != (SIZE_T) - 1 && dest) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dest, res + 1); + if (res != (SIZE_T)-1 && dest) { + SIZE_T write_cnt = res + (res < len); + COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dest, write_cnt); + } return res; } @@ -1599,12 +1607,13 @@ INTERCEPTOR(SIZE_T, wcsrtombs, char *dest, const wchar_t **src, SIZE_T len, void *ps) { void *ctx; COMMON_INTERCEPTOR_ENTER(ctx, wcsrtombs, dest, src, len, ps); - if (src) { - COMMON_INTERCEPTOR_READ_RANGE(ctx, src, sizeof(*src)); - } + COMMON_INTERCEPTOR_READ_RANGE(ctx, src, sizeof(*src)); SIZE_T res = REAL(wcsrtombs)(dest, src, len, ps); - if (res != (SIZE_T) - 1 && dest) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dest, res + 1); + if (res != (SIZE_T)-1 && dest) { + // Terminating '\0' is not printed iff *src is cleared. + SIZE_T write_cnt = res + !(*src); + COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dest, write_cnt); + } return res; } @@ -1620,13 +1629,16 @@ INTERCEPTOR(SIZE_T, wcsnrtombs, char *dest, const wchar_t **src, SIZE_T nms, SIZE_T len, void *ps) { void *ctx; COMMON_INTERCEPTOR_ENTER(ctx, wcsnrtombs, dest, src, nms, len, ps); - if (src) { + if (nms) { COMMON_INTERCEPTOR_READ_RANGE(ctx, src, sizeof(*src)); - if (nms) COMMON_INTERCEPTOR_READ_RANGE(ctx, *src, nms); + COMMON_INTERCEPTOR_READ_RANGE(ctx, *src, nms); } SIZE_T res = REAL(wcsnrtombs)(dest, src, nms, len, ps); - if (res != (SIZE_T) - 1 && dest) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dest, res + 1); + if (res != (SIZE_T)-1 && dest && nms) { + // Terminating '\0' is not printed iff *src is cleared. + SIZE_T write_cnt = res + !(*src); + COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dest, write_cnt); + } return res; } |