Take the heap lock in dvmIsHeapAddress.
Bug: 5049447
Change-Id: I9df6e4116efa44088d37ac0ff4455a7876535e1e
diff --git a/vm/alloc/Alloc.cpp b/vm/alloc/Alloc.cpp
index 7755f11..b37b9e1 100644
--- a/vm/alloc/Alloc.cpp
+++ b/vm/alloc/Alloc.cpp
@@ -350,7 +350,10 @@
bool dvmIsHeapAddress(void *address)
{
- return dvmHeapSourceContainsAddress(address);
+ dvmLockHeap();
+ bool result = dvmHeapSourceContainsAddress(address);
+ dvmUnlockHeap();
+ return result;
}
bool dvmIsNonMovingObject(const Object* object)