From 32bbf377e67398705dd33e097d94b0e23d9e84db Mon Sep 17 00:00:00 2001 From: Jim Van Verth Date: Wed, 20 Sep 2017 12:53:00 -0400 Subject: Fix TSAN issue with atlas expansion. Removes SkString-related malloc from DM crash handler, and adds null check in ProxyRefTest. Bug: skia:3550 Change-Id: I143c532b5d231a426b1a96b854e1effd6379b673 Reviewed-on: https://skia-review.googlesource.com/48440 Reviewed-by: Mike Klein Reviewed-by: Robert Phillips Commit-Queue: Jim Van Verth --- tests/ProxyRefTest.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests/ProxyRefTest.cpp') diff --git a/tests/ProxyRefTest.cpp b/tests/ProxyRefTest.cpp index e605716c39..202dd6aeed 100644 --- a/tests/ProxyRefTest.cpp +++ b/tests/ProxyRefTest.cpp @@ -54,6 +54,10 @@ static void check_refs(skiatest::Reporter* reporter, int32_t expectedBackingRefs, int32_t expectedNumReads, int32_t expectedNumWrites) { + REPORTER_ASSERT(reporter, proxy); + if (!proxy) { + return; + } REPORTER_ASSERT(reporter, proxy->getProxyRefCnt_TestOnly() == expectedProxyRefs); REPORTER_ASSERT(reporter, proxy->getBackingRefCnt_TestOnly() == expectedBackingRefs); REPORTER_ASSERT(reporter, proxy->getPendingReadCnt_TestOnly() == expectedNumReads); -- cgit v1.2.3