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

Merge "[incfs] Fix the block size calculation in .so extraction" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-15 00:52:43 +00:00
committed by Android (Google) Code Review
parent 82a29a3308 6c65a56d39
commit 3e188ae81d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/incremental/IncrementalService.cpp
View File

@@ -1333,13 +1333,13 @@ void IncrementalService::extractZipFile(const IfsMountPtr& ifs, ZipArchiveHandle
std::vector<IncFsDataBlock> instructions(numBlocks); std::vector<IncFsDataBlock> instructions(numBlocks);
auto remainingData = std::span(libData.get(), entry.uncompressed_length); auto remainingData = std::span(libData.get(), entry.uncompressed_length);
for (int i = 0; i < numBlocks; i++) { for (int i = 0; i < numBlocks; i++) {
const auto blockSize = std::min<uint16_t>(constants().blockSize, remainingData.size()); const auto blockSize = std::min<long>(constants().blockSize, remainingData.size());
instructions[i] = IncFsDataBlock{ instructions[i] = IncFsDataBlock{
.fileFd = writeFd.get(), .fileFd = writeFd.get(),
.pageIndex = static_cast<IncFsBlockIndex>(i), .pageIndex = static_cast<IncFsBlockIndex>(i),
.compression = INCFS_COMPRESSION_KIND_NONE, .compression = INCFS_COMPRESSION_KIND_NONE,
.kind = INCFS_BLOCK_KIND_DATA, .kind = INCFS_BLOCK_KIND_DATA,
.dataSize = blockSize, .dataSize = static_cast<uint32_t>(blockSize),
.data = reinterpret_cast<const char*>(remainingData.data()), .data = reinterpret_cast<const char*>(remainingData.data()),
}; };
remainingData = remainingData.subspan(blockSize); remainingData = remainingData.subspan(blockSize);