diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2013-04-24 09:20:25 +0000 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2013-04-24 09:20:25 +0000 |
| commit | 03049413f8978c202a254eb0acfa2f10b9bbe34a (patch) | |
| tree | 483efa8698e148f923246dba481a6eacae969c7d /lib/tsan/rtl/tsan_rtl_report.cc | |
| parent | 1d38069f4842973df02525c7bf77a5cbed3b03aa (diff) | |
| download | compiler-rt-03049413f8978c202a254eb0acfa2f10b9bbe34a.tar.gz compiler-rt-03049413f8978c202a254eb0acfa2f10b9bbe34a.tar.bz2 compiler-rt-03049413f8978c202a254eb0acfa2f10b9bbe34a.tar.xz | |
tsan: fix crash when data race happens on out-of-bounds accesses.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@180180 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/tsan/rtl/tsan_rtl_report.cc')
| -rw-r--r-- | lib/tsan/rtl/tsan_rtl_report.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/tsan/rtl/tsan_rtl_report.cc b/lib/tsan/rtl/tsan_rtl_report.cc index 40f42e02..8e85a09f 100644 --- a/lib/tsan/rtl/tsan_rtl_report.cc +++ b/lib/tsan/rtl/tsan_rtl_report.cc @@ -313,8 +313,9 @@ void ScopedReport::AddLocation(uptr addr, uptr size) { AddThread(tctx); return; } - if (allocator()->PointerIsMine((void*)addr)) { - MBlock *b = user_mblock(0, (void*)addr); + MBlock *b = 0; + if (allocator()->PointerIsMine((void*)addr) + && (b = user_mblock(0, (void*)addr))) { ThreadContext *tctx = FindThreadByTidLocked(b->Tid()); void *mem = internal_alloc(MBlockReportLoc, sizeof(ReportLocation)); ReportLocation *loc = new(mem) ReportLocation(); |