diff options
author | Kenny Root <kroot@google.com> | 2010-08-20 13:18:22 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-20 13:18:22 -0700 |
commit | b90b9d54eb6bbc3a4045ff0bf46d3366822e835e (patch) | |
tree | 283e7df99fedd20197dd5c1a4a42f4b308ee2fb8 | |
parent | c5794ae72547cce6cbae1e58df5d32bc0e2520fd (diff) | |
parent | 6be237120e9673e3cfc5243da5bbca287effcf09 (diff) | |
download | frameworks_base-b90b9d54eb6bbc3a4045ff0bf46d3366822e835e.zip frameworks_base-b90b9d54eb6bbc3a4045ff0bf46d3366822e835e.tar.gz frameworks_base-b90b9d54eb6bbc3a4045ff0bf46d3366822e835e.tar.bz2 |
am 6be23712: Merge "Free created FileMap when uncompressing files" into gingerbread
Merge commit '6be237120e9673e3cfc5243da5bbca287effcf09' into gingerbread-plus-aosp
* commit '6be237120e9673e3cfc5243da5bbca287effcf09':
Free created FileMap when uncompressing files
-rw-r--r-- | libs/utils/ZipFileRO.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libs/utils/ZipFileRO.cpp b/libs/utils/ZipFileRO.cpp index a4c3500..604f558 100644 --- a/libs/utils/ZipFileRO.cpp +++ b/libs/utils/ZipFileRO.cpp @@ -636,7 +636,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) @@ -644,6 +644,8 @@ bool ZipFileRO::uncompressEntry(ZipEntryRO entry, void* buffer) const result = true; +unmap: + file->release(); bail: return result; } @@ -667,7 +669,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; } @@ -678,21 +680,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; } |