From e1881269f8cdcb89f4862bc428f9f4bfb633068b Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 18 Dec 2014 10:19:32 +0000 Subject: [PATCH] tsan: don't crash with NULL deref during reporting tctx==NULL crash observed during deadlock reporting. There seems to be some bugs in the deadlock detector, but it is still useful to be more robust during reporting. llvm-svn: 224508 --- compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc b/compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc index 0481b23..ebaf892 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc +++ b/compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc @@ -251,7 +251,9 @@ ThreadContext *IsThreadStackOrTls(uptr addr, bool *is_stack) { void ScopedReport::AddThread(int unique_tid, bool suppressable) { #ifndef SANITIZER_GO - AddThread(FindThreadByUidLocked(unique_tid), suppressable); + const ThreadContext *tctx = FindThreadByUidLocked(unique_tid); + if (tctx) + AddThread(FindThreadByUidLocked(unique_tid), suppressable); #endif } -- 2.7.4