diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-01-13 20:02:03 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-01-13 20:02:03 +0000 |
| commit | fc411a9eb44c912f867b49a08d4ea98be89681d9 (patch) | |
| tree | 83d2530c824b866f040519d74b68316c571e0986 /lib/tsan | |
| parent | 4e3a0d5a8f750527f2f433019967f8f8214c558a (diff) | |
| download | src-fc411a9eb44c912f867b49a08d4ea98be89681d9.tar.gz src-fc411a9eb44c912f867b49a08d4ea98be89681d9.zip | |
Vendor import of compiler-rt trunk r257626:vendor/compiler-rt/compiler-rt-trunk-r257626
Notes
Notes:
svn path=/vendor/compiler-rt/dist/; revision=293842
svn path=/vendor/compiler-rt/compiler-rt-trunk-r257626/; revision=293843; tag=vendor/compiler-rt/compiler-rt-trunk-r257626
Diffstat (limited to 'lib/tsan')
| -rw-r--r-- | lib/tsan/rtl/tsan_interceptors.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/tsan/rtl/tsan_interceptors.cc b/lib/tsan/rtl/tsan_interceptors.cc index 62c96cb42047..7c835c6dc7df 100644 --- a/lib/tsan/rtl/tsan_interceptors.cc +++ b/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); } |