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

Merge "Change the parameter type of offset in read" am: 74a5df06af

Browse Source 
Change-Id: I17ab32142a564b3038db2f94f94c3e761f6905b1
This commit is contained in:
Tianjie Xu
2020-04-04 20:22:41 +00:00
committed by Automerger Merge Worker
parent a5518cb83f 74a5df06af
commit eead9e3eda
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/androidfw/ZipUtils.cpp
View File

@@ -40,7 +40,7 @@ class FileReader : public zip_archive::Reader {
explicit FileReader(FILE* fp) : Reader(), mFp(fp), mCurrentOffset(0) {
}
bool ReadAtOffset(uint8_t* buf, size_t len, uint32_t offset) const {
bool ReadAtOffset(uint8_t* buf, size_t len, off64_t offset) const {
// Data is usually requested sequentially, so this helps avoid pointless
// fseeks every time we perform a read. There's an impedence mismatch
// here because the original API was designed around pread and pwrite.
@@ -63,7 +63,7 @@ class FileReader : public zip_archive::Reader {
private:
FILE* mFp;
mutable uint32_t mCurrentOffset;
mutable off64_t mCurrentOffset;
};
class FdReader : public zip_archive::Reader {
@@ -71,8 +71,8 @@ class FdReader : public zip_archive::Reader {
explicit FdReader(int fd) : mFd(fd) {
}
bool ReadAtOffset(uint8_t* buf, size_t len, uint32_t offset) const {
return android::base::ReadFullyAtOffset(mFd, buf, len, static_cast<off_t>(offset));
bool ReadAtOffset(uint8_t* buf, size_t len, off64_t offset) const {
return android::base::ReadFullyAtOffset(mFd, buf, len, offset);
}
private:
@@ -86,8 +86,8 @@ class BufferReader : public zip_archive::Reader {
mInputSize(inputSize) {
}
bool ReadAtOffset(uint8_t* buf, size_t len, uint32_t offset) const {
if (offset + len > mInputSize) {
bool ReadAtOffset(uint8_t* buf, size_t len, off64_t offset) const {
if (mInputSize < len || offset > mInputSize - len) {
return false;
}