OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[asan] fix android build and lint 

llvm-svn: 169968
This commit is contained in:
Kostya Serebryany 2012-12-12 11:37:23 +00:00
parent 4e772db66a
commit 28a32c89e9
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler-rt/lib/asan/tests/asan_test.cc
View File

@ -1568,7 +1568,7 @@ TEST(AddressSanitizer, DISABLED_MemIntrinsicCallByPointerTest) {
#ifdef __linux__ #ifdef __linux__
TEST(AddressSanitizer, pread) { TEST(AddressSanitizer, pread) {
char *x = new char [10]; char *x = new char[10];
int fd = open("/proc/self/stat", O_RDONLY); int fd = open("/proc/self/stat", O_RDONLY);
ASSERT_GT(fd, 0); ASSERT_GT(fd, 0);
EXPECT_DEATH(pread(fd, x, 15, 0), EXPECT_DEATH(pread(fd, x, 15, 0),
@ -1579,8 +1579,9 @@ TEST(AddressSanitizer, pread) {
delete x; delete x;
} }
#ifndef ANDROID
TEST(AddressSanitizer, pread64) { TEST(AddressSanitizer, pread64) {
char *x = new char [10]; char *x = new char[10];
int fd = open("/proc/self/stat", O_RDONLY); int fd = open("/proc/self/stat", O_RDONLY);
ASSERT_GT(fd, 0); ASSERT_GT(fd, 0);
EXPECT_DEATH(pread64(fd, x, 15, 0), EXPECT_DEATH(pread64(fd, x, 15, 0),
@ -1590,9 +1591,10 @@ TEST(AddressSanitizer, pread64) {
close(fd); close(fd);
delete x; delete x;
} }
#endif // ANDROID
TEST(AddressSanitizer, read) { TEST(AddressSanitizer, read) {
char *x = new char [10]; char *x = new char[10];
int fd = open("/proc/self/stat", O_RDONLY); int fd = open("/proc/self/stat", O_RDONLY);
ASSERT_GT(fd, 0); ASSERT_GT(fd, 0);
EXPECT_DEATH(read(fd, x, 15), EXPECT_DEATH(read(fd, x, 15),

3
compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.h
View File

@ -52,7 +52,6 @@ INTERCEPTOR(ssize_t, pread64, int fd, void *ptr, size_t count, off64_t offset) {
#define SANITIZER_COMMON_INTERCEPTORS_INIT \ #define SANITIZER_COMMON_INTERCEPTORS_INIT \
CHECK(INTERCEPT_FUNCTION(read)); \ CHECK(INTERCEPT_FUNCTION(read)); \
CHECK(INTERCEPT_FUNCTION(pread)); \ CHECK(INTERCEPT_FUNCTION(pread)); \
CHECK(INTERCEPT_FUNCTION(pread64)) \ CHECK(INTERCEPT_FUNCTION(pread64));
;
#endif // SANITIZER_COMMON_INTERCEPTORS_H #endif // SANITIZER_COMMON_INTERCEPTORS_H