Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '0b60626391ec840cc4a6d58ef77a2d029c2209dd' into gingerbread-plus-aosp

* commit '0b60626391ec840cc4a6d58ef77a2d029c2209dd':
  Revert "Revert "Free created FileMap when uncompressing files""
This commit is contained in:
Kenny Root
2010-09-24 11:36:46 -07:00
committed by Android Git Automerger
parent 3e07c0007b 0b60626391
commit c55f6da728
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libs/utils/ZipFileRO.cpp
View File

@@ -643,7 +643,7 @@ bool ZipFileRO::uncompressEntry(ZipEntryRO entry, void* buffer) const
memcpy(buffer, ptr, uncompLen); memcpy(buffer, ptr, uncompLen);
} else { } else {
if (!inflateBuffer(buffer, ptr, uncompLen, compLen)) if (!inflateBuffer(buffer, ptr, uncompLen, compLen))
goto bail; goto unmap;
} }
if (compLen > kSequentialMin) if (compLen > kSequentialMin)
@@ -651,6 +651,8 @@ bool ZipFileRO::uncompressEntry(ZipEntryRO entry, void* buffer) const
result = true; result = true;
unmap:
file->release();
bail: bail:
return result; return result;
} }
@@ -674,7 +676,7 @@ bool ZipFileRO::uncompressEntry(ZipEntryRO entry, int fd) const
getEntryInfo(entry, &method, &uncompLen, &compLen, &offset, NULL, NULL); getEntryInfo(entry, &method, &uncompLen, &compLen, &offset, NULL, NULL);
const FileMap* file = createEntryFileMap(entry); FileMap* file = createEntryFileMap(entry);
if (file == NULL) { if (file == NULL) {
goto bail; goto bail;
} }
@@ -685,21 +687,23 @@ bool ZipFileRO::uncompressEntry(ZipEntryRO entry, int fd) const
ssize_t actual = write(fd, ptr, uncompLen); ssize_t actual = write(fd, ptr, uncompLen);
if (actual < 0) { if (actual < 0) {
LOGE("Write failed: %s\n", strerror(errno)); LOGE("Write failed: %s\n", strerror(errno));
goto bail; goto unmap;
} 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",
(size_t)actual, (size_t)uncompLen); (size_t)actual, (size_t)uncompLen);
goto bail; goto unmap;
} else { } else {
LOGI("+++ successful write\n"); LOGI("+++ successful write\n");
} }
} else { } else {
if (!inflateBuffer(fd, ptr, uncompLen, compLen)) if (!inflateBuffer(fd, ptr, uncompLen, compLen))
goto bail; goto unmap;
} }
result = true; result = true;
unmap:
file->release();
bail: bail:
return result; return result;
} }