diff options
| author |  Jim Van Verth <jvanverth@google.com> | 2017-09-20 12:53:00 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-20 17:46:59 +0000 |
| commit | 32bbf377e67398705dd33e097d94b0e23d9e84db (patch) | |
| tree | 3b5109688bf67aedef35ddf963accf13a47c2607 /tests/ProxyRefTest.cpp | |
| parent | f20e77bcb6d3d5aae693bcefa0a5270d5f39890e (diff) | |
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 <mtklein@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Diffstat (limited to 'tests/ProxyRefTest.cpp')
| -rw-r--r-- | tests/ProxyRefTest.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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); |