Fix thread race caused double free issue. (09901f3b) · Commits · e / os / android_frameworks_base

libs/androidfw/AssetManager.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -1893,6 +1893,7 @@ ZipFileRO* AssetManager::SharedZip::getZip()

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