drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[AssetManager]:Fix thread race caused double free issue." am: 126e022095

Browse Source 
am: f48d0b8f19

Change-Id: Ia7da9ff37d813729a8c916a3b6e378110045aa17
This commit is contained in:
Adam Lesinski
2016-10-03 20:21:46 +00:00
committed by android-build-merger
parent 164c750f8d f48d0b8f19
commit 73b91c63ad
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/androidfw/AssetManager.cpp
View File

@ -1892,6 +1892,7 @@ ZipFileRO* AssetManager::SharedZip::getZip()
Asset* AssetManager::SharedZip::getResourceTableAsset() Asset* AssetManager::SharedZip::getResourceTableAsset()
{ {
AutoMutex _l(gLock);
ALOGV("Getting from SharedZip %p resource asset %p\n", this, mResourceTableAsset); ALOGV("Getting from SharedZip %p resource asset %p\n", this, mResourceTableAsset);
return mResourceTableAsset; return mResourceTableAsset;
} }
@ -1901,10 +1902,10 @@ Asset* AssetManager::SharedZip::setResourceTableAsset(Asset* asset)
{ {
AutoMutex _l(gLock); AutoMutex _l(gLock);
if (mResourceTableAsset == NULL) { if (mResourceTableAsset == NULL) {
mResourceTableAsset = asset;
// This is not thread safe the first time it is called, so // This is not thread safe the first time it is called, so
// do it here with the global lock held. // do it here with the global lock held.
asset->getBuffer(true); asset->getBuffer(true);
mResourceTableAsset = asset;
return asset; return asset;
} }
} }