diff options
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc | 4 | ||||
| -rw-r--r-- | compiler-rt/test/asan/TestCases/Posix/freopen.cc | 15 |
2 files changed, 17 insertions, 2 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc index 6ad71a4eaec..386c8a4567f 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc @@ -4769,7 +4769,7 @@ INTERCEPTOR(__sanitizer_FILE *, freopen, const char *path, const char *mode, __sanitizer_FILE *fp) { void *ctx; COMMON_INTERCEPTOR_ENTER(ctx, freopen, path, mode, fp); - COMMON_INTERCEPTOR_READ_RANGE(ctx, path, REAL(strlen)(path) + 1); + if (path) COMMON_INTERCEPTOR_READ_RANGE(ctx, path, REAL(strlen)(path) + 1); COMMON_INTERCEPTOR_READ_RANGE(ctx, mode, REAL(strlen)(mode) + 1); COMMON_INTERCEPTOR_FILE_CLOSE(ctx, fp); __sanitizer_FILE *res = REAL(freopen)(path, mode, fp); @@ -4800,7 +4800,7 @@ INTERCEPTOR(__sanitizer_FILE *, freopen64, const char *path, const char *mode, __sanitizer_FILE *fp) { void *ctx; COMMON_INTERCEPTOR_ENTER(ctx, freopen64, path, mode, fp); - COMMON_INTERCEPTOR_READ_RANGE(ctx, path, REAL(strlen)(path) + 1); + if (path) COMMON_INTERCEPTOR_READ_RANGE(ctx, path, REAL(strlen)(path) + 1); COMMON_INTERCEPTOR_READ_RANGE(ctx, mode, REAL(strlen)(mode) + 1); COMMON_INTERCEPTOR_FILE_CLOSE(ctx, fp); __sanitizer_FILE *res = REAL(freopen64)(path, mode, fp); diff --git a/compiler-rt/test/asan/TestCases/Posix/freopen.cc b/compiler-rt/test/asan/TestCases/Posix/freopen.cc new file mode 100644 index 00000000000..c137abb8fcb --- /dev/null +++ b/compiler-rt/test/asan/TestCases/Posix/freopen.cc @@ -0,0 +1,15 @@ +// RUN: %clangxx_asan -O0 %s -o %t && %run %t + +// This fails on i386 Linux due to a glibc versioned symbols mixup. +// REQUIRES: asan-64-bits + +#include <assert.h> +#include <stdio.h> + +int main() { + FILE *fp = fopen("/dev/null", "w"); + assert(fp); + freopen(NULL, "a", fp); + fclose(fp); + return 0; +} |
