commit 32bbf377e67398705dd33e097d94b0e23d9e84db
author Jim Van Verth <jvanverth@google.com> Wed Sep 20 12:53:00 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Sep 20 17:46:59 2017 +0000
tree 3b5109688bf67aedef35ddf963accf13a47c2607
parent f20e77bcb6d3d5aae693bcefa0a5270d5f39890e

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>

dm/DM.cpp

diff --git a/dm/DM.cpp b/dm/DM.cpp
index 7954744..777a593 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -116,7 +116,9 @@
 template <typename... Args>
 static void vlog(const char* fmt, Args&&... args) {
     if (gVLog) {
-        fprintf(gVLog, "%s\t", HumanizeMs(SkTime::GetMSecs() - kStartMs).c_str());
+        char s[64];
+        HumanizeMs(s, 64, SkTime::GetMSecs() - kStartMs);
+        fprintf(gVLog, "%s\t", s);
         fprintf(gVLog, fmt, args...);
         fflush(gVLog);
     }