summaryrefslogtreecommitdiff
path: root/lib/tsan/rtl/tsan_sync.cc
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2013-04-24 09:20:25 +0000
committerDmitry Vyukov <dvyukov@google.com>2013-04-24 09:20:25 +0000
commit03049413f8978c202a254eb0acfa2f10b9bbe34a (patch)
tree483efa8698e148f923246dba481a6eacae969c7d /lib/tsan/rtl/tsan_sync.cc
parent1d38069f4842973df02525c7bf77a5cbed3b03aa (diff)
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_sync.cc')
-rw-r--r--lib/tsan/rtl/tsan_sync.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/tsan/rtl/tsan_sync.cc b/lib/tsan/rtl/tsan_sync.cc
index 94bad2193..c6ddcdb37 100644
--- a/lib/tsan/rtl/tsan_sync.cc
+++ b/lib/tsan/rtl/tsan_sync.cc
@@ -82,6 +82,7 @@ SyncVar* SyncTab::GetAndLock(ThreadState *thr, uptr pc,
// the hashmap anyway.
if (PrimaryAllocator::PointerIsMine((void*)addr)) {
MBlock *b = user_mblock(thr, (void*)addr);
+ CHECK_NE(b, 0);
MBlock::ScopedLock l(b);
SyncVar *res = 0;
for (res = b->ListHead(); res; res = res->next) {
@@ -146,6 +147,7 @@ SyncVar* SyncTab::GetAndRemove(ThreadState *thr, uptr pc, uptr addr) {
}
if (PrimaryAllocator::PointerIsMine((void*)addr)) {
MBlock *b = user_mblock(thr, (void*)addr);
+ CHECK_NE(b, 0);
SyncVar *res = 0;
{
MBlock::ScopedLock l(b);