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

Commit 26609e2c authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Re-apply androidfw fixes lost by the directory rearrangement. 

Assignment to wrong variable in libs/androidfw/AssetManager.cpp.
https://code.google.com/p/android/issues/detail?id=61560

Missing delete[]s in libs/androidfw/ObbFile.cpp.
https://code.google.com/p/android/issues/detail?id=61549

Change-Id: I24e6867284d70a7793d78e62d1a836cbee310fb0
parent 3d0c7797

libs/androidfw/AssetManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ const ResTable* AssetManager::getResTable(bool required) const 
            }

        } else {

            ALOGV("loading resource table %s\n", ap.path.string());

            Asset* ass = const_cast<AssetManager*>(this)->

            ass = const_cast<AssetManager*>(this)->

                openNonAssetInPathLocked("resources.arsc",

                                         Asset::ACCESS_BUFFER,

                                         ap);

libs/androidfw/ObbFile.cpp

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ bool ObbFile::parseObbFile(int fd) 
    {

        lseek64(fd, fileLength - kFooterTagSize, SEEK_SET);



        char *footer = new char[kFooterTagSize];

        char footer[kFooterTagSize];

        actual = TEMP_FAILURE_RETRY(read(fd, footer, kFooterTagSize));

        if (actual != kFooterTagSize) {

            ALOGW("couldn't read footer signature: %s\n", strerror(errno));