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

Commit 16ead473 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am 2a08e2a9: am a19ef306: Revert "Free created FileMap when uncompressing files" 

Merge commit '2a08e2a9f881d06a03e36367585137e05706f592'

* commit '2a08e2a9f881d06a03e36367585137e05706f592':
  Revert "Free created FileMap when uncompressing files"
parents 80d65d27 c41ba2bd

libs/utils/ZipFileRO.cpp

+5 −9
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ bool ZipFileRO::uncompressEntry(ZipEntryRO entry, void* buffer) const 
        memcpy(buffer, ptr, uncompLen);

    } else {

        if (!inflateBuffer(buffer, ptr, uncompLen, compLen))

            goto unmap;

            goto bail;

    }



    if (compLen > kSequentialMin)
@@ -644,8 +644,6 @@ bool ZipFileRO::uncompressEntry(ZipEntryRO entry, void* buffer) const 


    result = true;



unmap:

    file->release();

bail:

    return result;

}
@@ -669,7 +667,7 @@ bool ZipFileRO::uncompressEntry(ZipEntryRO entry, int fd) const 


    getEntryInfo(entry, &method, &uncompLen, &compLen, &offset, NULL, NULL);



    FileMap* file = createEntryFileMap(entry);

    const FileMap* file = createEntryFileMap(entry);

    if (file == NULL) {

        goto bail;

    }
@@ -680,23 +678,21 @@ bool ZipFileRO::uncompressEntry(ZipEntryRO entry, int fd) const 
        ssize_t actual = write(fd, ptr, uncompLen);

        if (actual < 0) {

            LOGE("Write failed: %s\n", strerror(errno));

            goto unmap;

            goto bail;

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

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

                (size_t)actual, (size_t)uncompLen);

            goto unmap;

            goto bail;

        } else {

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

        }

    } else {

        if (!inflateBuffer(fd, ptr, uncompLen, compLen))

            goto unmap;

            goto bail;

    }



    result = true;



unmap:

    file->release();

bail:

    return result;

}