diff options
| author | Alexey Samsonov <vonosmas@gmail.com> | 2014-07-22 00:10:08 +0000 |
|---|---|---|
| committer | Alexey Samsonov <vonosmas@gmail.com> | 2014-07-22 00:10:08 +0000 |
| commit | a9c43b32c19449a0e8d3e0f67b072c3c7077347c (patch) | |
| tree | 3ee05dc15f6d26478f027b1104b94bec221ddce0 | |
| parent | 3e78a212173237fe88f2cd863acf8c99dc3ef425 (diff) | |
| download | compiler-rt-a9c43b32c19449a0e8d3e0f67b072c3c7077347c.tar.gz | |
[MSan] Fix strncpy interceptor
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@213590 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/msan/msan_interceptors.cc | 1 | ||||
| -rw-r--r-- | lib/msan/tests/msan_test.cc | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/msan/msan_interceptors.cc b/lib/msan/msan_interceptors.cc index cb35b8d52..88e19d0db 100644 --- a/lib/msan/msan_interceptors.cc +++ b/lib/msan/msan_interceptors.cc @@ -260,6 +260,7 @@ INTERCEPTOR(char *, strncpy, char *dest, const char *src, SIZE_T n) { // NOLINT copy_size++; // trailing \0 char *res = REAL(strncpy)(dest, src, n); // NOLINT CopyPoison(dest, src, copy_size, &stack); + __msan_unpoison(dest + copy_size, n - copy_size); return res; } diff --git a/lib/msan/tests/msan_test.cc b/lib/msan/tests/msan_test.cc index f7268d68f..813606ed3 100644 --- a/lib/msan/tests/msan_test.cc +++ b/lib/msan/tests/msan_test.cc @@ -1483,14 +1483,16 @@ TEST(MemorySanitizer, strcpy) { // NOLINT TEST(MemorySanitizer, strncpy) { // NOLINT char* x = new char[3]; - char* y = new char[3]; + char* y = new char[5]; x[0] = 'a'; x[1] = *GetPoisoned<char>(1, 1); - x[2] = 0; - strncpy(y, x, 2); // NOLINT + x[2] = '\0'; + strncpy(y, x, 4); // NOLINT EXPECT_NOT_POISONED(y[0]); EXPECT_POISONED(y[1]); - EXPECT_POISONED(y[2]); + EXPECT_NOT_POISONED(y[2]); + EXPECT_NOT_POISONED(y[3]); + EXPECT_POISONED(y[4]); } TEST(MemorySanitizer, stpcpy) { // NOLINT |