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

Commit 323b75e3 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am c55f6da7: am 0b606263: Merge "Revert "Revert "Free created FileMap when... 

am c55f6da7: am 0b606263: Merge "Revert "Revert "Free created FileMap when uncompressing files""" into gingerbread

Merge commit 'c55f6da7281d34a4b875975cdf68f5062dfe4b34'

* commit 'c55f6da7281d34a4b875975cdf68f5062dfe4b34':
  Revert "Revert "Free created FileMap when uncompressing files""
parents d6d93dbb 718a7db7

libs/utils/ZipFileRO.cpp

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

    } else {

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

            goto bail;

            goto unmap;

    }



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


    result = true;



unmap:

    file->release();

bail:

    return result;

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


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



    const FileMap* file = createEntryFileMap(entry);

    FileMap* file = createEntryFileMap(entry);

    if (file == NULL) {

        goto bail;

    }
@@ -685,21 +687,23 @@ 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 bail;

            goto unmap;

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

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

                (size_t)actual, (size_t)uncompLen);

            goto bail;

            goto unmap;

        } else {

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

        }

    } else {

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

            goto bail;

            goto unmap;

    }



    result = true;



unmap:

    file->release();

bail:

    return result;

}