zipalign/ziptime: use ftello()/fseeko().
Even if we were shipping 64-bit Windows host tools (which we still aren't), this would still be a bug. Windows is LLP64 instead of LP64, so the long that ftell()/fseek() uses isn't big enough for a 64-bit off_t. Test: treehugger Change-Id: I4e24afe811ff9b7d5696887cc5ee92e54e4a3b76
This commit is contained in:
@@ -43,19 +43,16 @@ using namespace android;
|
||||
*/
|
||||
status_t ZipEntry::initAndRewriteFromCDE(FILE* fp)
|
||||
{
|
||||
status_t result;
|
||||
long posn;
|
||||
|
||||
/* read the CDE */
|
||||
result = mCDE.rewrite(fp);
|
||||
status_t result = mCDE.rewrite(fp);
|
||||
if (result != 0) {
|
||||
LOG("mCDE.rewrite failed\n");
|
||||
return result;
|
||||
}
|
||||
|
||||
/* using the info in the CDE, go load up the LFH */
|
||||
posn = ftell(fp);
|
||||
if (fseek(fp, mCDE.mLocalHeaderRelOffset, SEEK_SET) != 0) {
|
||||
off_t posn = ftello(fp);
|
||||
if (fseeko(fp, mCDE.mLocalHeaderRelOffset, SEEK_SET) != 0) {
|
||||
LOG("local header seek failed (%" PRIu32 ")\n",
|
||||
mCDE.mLocalHeaderRelOffset);
|
||||
return -1;
|
||||
@@ -67,7 +64,7 @@ status_t ZipEntry::initAndRewriteFromCDE(FILE* fp)
|
||||
return result;
|
||||
}
|
||||
|
||||
if (fseek(fp, posn, SEEK_SET) != 0)
|
||||
if (fseeko(fp, posn, SEEK_SET) != 0)
|
||||
return -1;
|
||||
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user