diff options
author | Yury Gribov <y.gribov@samsung.com> | 2015-10-22 08:10:56 +0000 |
---|---|---|
committer | Yury Gribov <y.gribov@samsung.com> | 2015-10-22 08:10:56 +0000 |
commit | 6db176913c038833047640f591b18f105ac51732 (patch) | |
tree | f41de46539ca1b1d15e09e7a7a635c089e5bdf4c /test | |
parent | d6184a3b9865249280fdf03830f4b907855ea842 (diff) |
[asan] Get rid of UB in string tests. Patch by Max Ostapenko.
Differential revision: http://reviews.llvm.org/D13895
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@250998 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
-rw-r--r-- | test/asan/TestCases/strcasestr-1.c | 9 | ||||
-rw-r--r-- | test/asan/TestCases/strcasestr-2.c | 7 | ||||
-rw-r--r-- | test/asan/TestCases/strcspn-1.c | 7 | ||||
-rw-r--r-- | test/asan/TestCases/strcspn-2.c | 7 | ||||
-rw-r--r-- | test/asan/TestCases/strpbrk-1.c | 7 | ||||
-rw-r--r-- | test/asan/TestCases/strpbrk-2.c | 7 | ||||
-rw-r--r-- | test/asan/TestCases/strspn-1.c | 7 | ||||
-rw-r--r-- | test/asan/TestCases/strspn-2.c | 7 | ||||
-rw-r--r-- | test/asan/TestCases/strstr-1.c | 7 | ||||
-rw-r--r-- | test/asan/TestCases/strstr-2.c | 7 |
10 files changed, 41 insertions, 31 deletions
diff --git a/test/asan/TestCases/strcasestr-1.c b/test/asan/TestCases/strcasestr-1.c index 78e14d31f..c38871ea5 100644 --- a/test/asan/TestCases/strcasestr-1.c +++ b/test/asan/TestCases/strcasestr-1.c @@ -11,14 +11,15 @@ #define _GNU_SOURCE #include <assert.h> #include <string.h> +#include <sanitizer/asan_interface.h> int main(int argc, char **argv) { char *r = 0; char s2[] = "c"; - char s1[] = {'a', 'C'}; - char s3 = 0; + char s1[4] = "abC"; + __asan_poison_memory_region ((char *)&s1[2], 2); r = strcasestr(s1, s2); - // CHECK:'s{{[1|3]}}' <== Memory access at offset {{[0-9]+ .*}}flows this variable - assert(r == s1 + 1); + // CHECK:'s1' <== Memory access at offset {{[0-9]+}} partially overflows this variable + assert(r == s1 + 2); return 0; } diff --git a/test/asan/TestCases/strcasestr-2.c b/test/asan/TestCases/strcasestr-2.c index 4593a143e..cca6d208c 100644 --- a/test/asan/TestCases/strcasestr-2.c +++ b/test/asan/TestCases/strcasestr-2.c @@ -11,14 +11,15 @@ #define _GNU_SOURCE #include <assert.h> #include <string.h> +#include <sanitizer/asan_interface.h> int main(int argc, char **argv) { char *r = 0; char s1[] = "ab"; - char s2[] = {'c'}; - char s3 = 0; + char s2[4] = "cba"; + __asan_poison_memory_region ((char *)&s2[2], 2); r = strcasestr(s1, s2); assert(r == 0); - // CHECK:'s{{[2|3]}}' <== Memory access at offset {{[0-9]+ .*}}flows this variable + // CHECK:'s2' <== Memory access at offset {{[0-9]+}} partially overflows this variable return 0; } diff --git a/test/asan/TestCases/strcspn-1.c b/test/asan/TestCases/strcspn-1.c index 04675e4b4..6cda2e210 100644 --- a/test/asan/TestCases/strcspn-1.c +++ b/test/asan/TestCases/strcspn-1.c @@ -6,14 +6,15 @@ #include <assert.h> #include <string.h> +#include <sanitizer/asan_interface.h> int main(int argc, char **argv) { size_t r; char s2[] = "ab"; - char s1[] = {'c', 'a'}; - char s3 = 0; + char s1[4] = "caB"; + __asan_poison_memory_region ((char *)&s1[2], 2); r = strcspn(s1, s2); - // CHECK:'s{{[1|3]}}' <== Memory access at offset {{[0-9]+ .*}}flows this variable + // CHECK:'s1' <== Memory access at offset {{[0-9]+}} partially overflows this variable assert(r == 1); return 0; } diff --git a/test/asan/TestCases/strcspn-2.c b/test/asan/TestCases/strcspn-2.c index e77ce6502..8bb4b8a57 100644 --- a/test/asan/TestCases/strcspn-2.c +++ b/test/asan/TestCases/strcspn-2.c @@ -6,14 +6,15 @@ #include <assert.h> #include <string.h> +#include <sanitizer/asan_interface.h> int main(int argc, char **argv) { size_t r; char s1[] = "ab"; - char s2[] = {'a'}; - char s3 = 0; + char s2[4] = "abc"; + __asan_poison_memory_region ((char *)&s2[2], 2); r = strcspn(s1, s2); - // CHECK:'s{{[2|3]}}' <== Memory access at offset {{[0-9]+ .*}}flows this variable + // CHECK:'s2' <== Memory access at offset {{[0-9]+}} partially overflows this variable assert(r == 0); return 0; } diff --git a/test/asan/TestCases/strpbrk-1.c b/test/asan/TestCases/strpbrk-1.c index b7a784d99..626e8777e 100644 --- a/test/asan/TestCases/strpbrk-1.c +++ b/test/asan/TestCases/strpbrk-1.c @@ -6,14 +6,15 @@ #include <assert.h> #include <string.h> +#include <sanitizer/asan_interface.h> int main(int argc, char **argv) { char *r; char s2[] = "ab"; - char s1[] = {'c', 'a'}; - char s3 = 0; + char s1[4] = "cab"; + __asan_poison_memory_region ((char *)&s1[2], 2); r = strpbrk(s1, s2); - // CHECK:'s{{[1|3]}}' <== Memory access at offset {{[0-9]+ .*}}flows this variable + // CHECK:'s1' <== Memory access at offset {{[0-9]+}} partially overflows this variable assert(r == s1 + 1); return 0; } diff --git a/test/asan/TestCases/strpbrk-2.c b/test/asan/TestCases/strpbrk-2.c index 748662be7..29f3150e6 100644 --- a/test/asan/TestCases/strpbrk-2.c +++ b/test/asan/TestCases/strpbrk-2.c @@ -6,14 +6,15 @@ #include <assert.h> #include <string.h> +#include <sanitizer/asan_interface.h> int main(int argc, char **argv) { char *r; char s1[] = "c"; - char s2[] = {'b', 'c'}; - char s3 = 0; + char s2[4] = "bca"; + __asan_poison_memory_region ((char *)&s2[2], 2); r = strpbrk(s1, s2); - // CHECK:'s{{[2|3]}}' <== Memory access at offset {{[0-9]+ .*}}flows this variable + // CHECK:'s2' <== Memory access at offset {{[0-9]+}} partially overflows this variable assert(r == s1); return 0; } diff --git a/test/asan/TestCases/strspn-1.c b/test/asan/TestCases/strspn-1.c index c15869d90..b0c40ea4d 100644 --- a/test/asan/TestCases/strspn-1.c +++ b/test/asan/TestCases/strspn-1.c @@ -6,14 +6,15 @@ #include <assert.h> #include <string.h> +#include <sanitizer/asan_interface.h> int main(int argc, char **argv) { size_t r; char s2[] = "ab"; - char s1[] = {'a', 'c'}; - char s3 = 0; + char s1[4] = "acb"; + __asan_poison_memory_region ((char *)&s1[2], 2); r = strspn(s1, s2); - // CHECK:'s{{[1|3]}}' <== Memory access at offset {{[0-9]+ .*}}flows this variable + // CHECK:'s1' <== Memory access at offset {{[0-9]+}} partially overflows this variable assert(r == 1); return 0; } diff --git a/test/asan/TestCases/strspn-2.c b/test/asan/TestCases/strspn-2.c index 57b3e6cd9..4c899108d 100644 --- a/test/asan/TestCases/strspn-2.c +++ b/test/asan/TestCases/strspn-2.c @@ -6,14 +6,15 @@ #include <assert.h> #include <string.h> +#include <sanitizer/asan_interface.h> int main(int argc, char **argv) { size_t r; char s1[] = "bbc"; - char s2[] = {'a', 'b'}; - char s3 = 0; + char s2[5] = "abcd"; + __asan_poison_memory_region ((char *)&s2[3], 2); r = strspn(s1, s2); - // CHECK:'s{{[2|3]}}' <== Memory access at offset {{[0-9]+ .*}}flows this variable + // CHECK:'s2' <== Memory access at offset {{[0-9]+}} partially overflows this variable assert(r >= 2); return 0; } diff --git a/test/asan/TestCases/strstr-1.c b/test/asan/TestCases/strstr-1.c index 842e1737e..d0fa25bc6 100644 --- a/test/asan/TestCases/strstr-1.c +++ b/test/asan/TestCases/strstr-1.c @@ -7,14 +7,15 @@ #include <assert.h> #include <string.h> +#include <sanitizer/asan_interface.h> int main(int argc, char **argv) { char *r = 0; char s2[] = "c"; - char s1[] = {'a', 'c'}; - char s3 = 0; + char s1[4] = "acb"; + __asan_poison_memory_region ((char *)&s1[2], 2); r = strstr(s1, s2); - // CHECK:'s{{[1|3]}}' <== Memory access at offset {{[0-9]+ .*}}flows this variable + // CHECK:'s1' <== Memory access at offset {{[0-9]+}} partially overflows this variable assert(r == s1 + 1); return 0; } diff --git a/test/asan/TestCases/strstr-2.c b/test/asan/TestCases/strstr-2.c index 77d7cc52a..edb700865 100644 --- a/test/asan/TestCases/strstr-2.c +++ b/test/asan/TestCases/strstr-2.c @@ -7,14 +7,15 @@ #include <assert.h> #include <string.h> +#include <sanitizer/asan_interface.h> int main(int argc, char **argv) { char *r = 0; char s1[] = "ab"; - char s2[] = {'c'}; - char s3 = 0; + char s2[4] = "cab"; + __asan_poison_memory_region ((char *)&s2[2], 2); r = strstr(s1, s2); - // CHECK:'s{{[2|3]}}' <== Memory access at offset {{[0-9]+ .*}}flows this variable + // CHECK:'s2' <== Memory access at offset {{[0-9]+}} partially overflows this variable assert(r == 0); return 0; } |