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

Commit 8c16a393 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am aec3e36f: am 2d817f75: Free scanBuf in ZipFileRO 

Merge commit 'aec3e36fd4f8cdcc53110bbcd7f0afa20bf315d4'

* commit 'aec3e36fd4f8cdcc53110bbcd7f0afa20bf315d4':
  Free scanBuf in ZipFileRO
parents a697b7e8 ddf21528

libs/utils/ZipFileRO.cpp

+4 −6
Original line number Original line Diff line number Diff line
@@ -253,21 +253,21 @@ bool ZipFileRO::mapCentralDirectory(void) 




    /*

    /*

     * Grab the CD offset and size, and the number of entries in the

     * Grab the CD offset and size, and the number of entries in the

     * archive.  Verify that they look reasonable.

     * archive. After that, we can release our EOCD hunt buffer.

     */

     */

    unsigned int numEntries = get2LE(eocdPtr + kEOCDNumEntries);

    unsigned int numEntries = get2LE(eocdPtr + kEOCDNumEntries);

    unsigned int dirSize = get4LE(eocdPtr + kEOCDSize);

    unsigned int dirSize = get4LE(eocdPtr + kEOCDSize);

    unsigned int dirOffset = get4LE(eocdPtr + kEOCDFileOffset);

    unsigned int dirOffset = get4LE(eocdPtr + kEOCDFileOffset);

    free(scanBuf);





    // Verify that they look reasonable.

    if ((long long) dirOffset + (long long) dirSize > (long long) eocdOffset) {

    if ((long long) dirOffset + (long long) dirSize > (long long) eocdOffset) {

        LOGW("bad offsets (dir %ld, size %u, eocd %ld)\n",

        LOGW("bad offsets (dir %ld, size %u, eocd %ld)\n",

            (long) dirOffset, dirSize, (long) eocdOffset);

            (long) dirOffset, dirSize, (long) eocdOffset);

        free(scanBuf);

        return false;

        return false;

    }

    }

    if (numEntries == 0) {

    if (numEntries == 0) {

        LOGW("empty archive?\n");

        LOGW("empty archive?\n");

        free(scanBuf);

        return false;

        return false;

    }

    }
@@ -277,14 +277,12 @@ bool ZipFileRO::mapCentralDirectory(void) 
    mDirectoryMap = new FileMap();

    mDirectoryMap = new FileMap();

    if (mDirectoryMap == NULL) {

    if (mDirectoryMap == NULL) {

        LOGW("Unable to create directory map: %s", strerror(errno));

        LOGW("Unable to create directory map: %s", strerror(errno));

        free(scanBuf);

        return false;

        return false;

    }

    }





    if (!mDirectoryMap->create(mFileName, mFd, dirOffset, dirSize, true)) {

    if (!mDirectoryMap->create(mFileName, mFd, dirOffset, dirSize, true)) {

        LOGW("Unable to map '%s' (%zd to %zd): %s\n", mFileName,

        LOGW("Unable to map '%s' (%zd to %zd): %s\n", mFileName,

                dirOffset, dirOffset + dirSize, strerror(errno));

                dirOffset, dirOffset + dirSize, strerror(errno));

        free(scanBuf);

        return false;

        return false;

    }

    }
@@ -683,7 +681,7 @@ bool ZipFileRO::uncompressEntry(ZipEntryRO entry, int fd) const 
            goto bail;

            goto bail;

        } else if ((size_t) actual != uncompLen) {

        } else if ((size_t) actual != uncompLen) {

            LOGE("Partial write during uncompress (%zd of %zd)\n",

            LOGE("Partial write during uncompress (%zd of %zd)\n",

                actual, uncompLen);

                (size_t)actual, (size_t)uncompLen);

            goto bail;

            goto bail;

        } else {

        } else {

            LOGI("+++ successful write\n");

            LOGI("+++ successful write\n");