commit 2edf599eebd370d5a95cafb2a668c4e9e0e9c094
author halcanary <halcanary@google.com> Thu Mar 26 14:08:56 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Mar 26 14:08:56 2015 -0700
tree 16c4a2269ba5a8d2ae5023471e3aef0c5ab68be0
parent a644116c3375b12c642d1b51ee1e5cf4a22c1f5b

Fix DiscardableMemoryPool::free race condition

BUG=skia:3596

Review URL: https://codereview.chromium.org/1017943003

src/lazy/SkDiscardableMemoryPool.cpp

diff --git a/src/lazy/SkDiscardableMemoryPool.cpp b/src/lazy/SkDiscardableMemoryPool.cpp
index 1f48366..5b9d87f 100644
--- a/src/lazy/SkDiscardableMemoryPool.cpp
+++ b/src/lazy/SkDiscardableMemoryPool.cpp
@@ -188,9 +188,9 @@
 }
 
 void DiscardableMemoryPool::free(PoolDiscardableMemory* dm) {
+    SkAutoMutexAcquire autoMutexAcquire(fMutex);
     // This is called by dm's destructor.
     if (dm->fPointer != NULL) {
-        SkAutoMutexAcquire autoMutexAcquire(fMutex);
         sk_free(dm->fPointer);
         dm->fPointer = NULL;
         SkASSERT(fUsed >= dm->fBytes);