diff options
| -rw-r--r-- | compiler-rt/lib/tsan/rtl/tsan_interceptors.cc | 6 | ||||
| -rw-r--r-- | compiler-rt/test/sanitizer_common/TestCases/Linux/closedir.c | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc b/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc index 62c96cb4204..7c835c6dc7d 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc +++ b/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc @@ -1892,8 +1892,10 @@ TSAN_INTERCEPTOR(int, rmdir, char *path) { TSAN_INTERCEPTOR(int, closedir, void *dirp) { SCOPED_TSAN_INTERCEPTOR(closedir, dirp); - int fd = dirfd(dirp); - FdClose(thr, pc, fd); + if (dirp) { + int fd = dirfd(dirp); + FdClose(thr, pc, fd); + } return REAL(closedir)(dirp); } diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/closedir.c b/compiler-rt/test/sanitizer_common/TestCases/Linux/closedir.c new file mode 100644 index 00000000000..990628db402 --- /dev/null +++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/closedir.c @@ -0,0 +1,5 @@ +// Check that closedir(NULL) is ok. +// RUN: %clang -O2 %s -o %t && %run %t +#include <sys/types.h> +#include <dirent.h> +int main() { closedir(0); } |
