Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68ec3695 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

Merge "Fix thread race caused double free issue." into nyc-mr1-dev

parents 20cf0015 5754b41c

libs/androidfw/AssetManager.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1892,6 +1892,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;

}
@@ -1901,10 +1902,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;

        }

    }