summaryrefslogtreecommitdiffstats
path: root/fuse_sideload/fuse_provider.cpp
diff options
context:
space:
mode:
authorCheng Chang <changcheng0curl@gmail.com>2021-12-27 09:40:29 +0100
committerCheng Chang <changcheng0curl@gmail.com>2022-03-01 09:40:40 +0100
commita0732906aedf3c35e3ea21c0902ca237b81d15cc (patch)
treef327275e4480d4997437fc3e46f4c82d3f2c5519 /fuse_sideload/fuse_provider.cpp
parentMerge "Move package verifier from libinstall to libotautil" (diff)
downloadandroid_bootable_recovery-a0732906aedf3c35e3ea21c0902ca237b81d15cc.tar
android_bootable_recovery-a0732906aedf3c35e3ea21c0902ca237b81d15cc.tar.gz
android_bootable_recovery-a0732906aedf3c35e3ea21c0902ca237b81d15cc.tar.bz2
android_bootable_recovery-a0732906aedf3c35e3ea21c0902ca237b81d15cc.tar.lz
android_bootable_recovery-a0732906aedf3c35e3ea21c0902ca237b81d15cc.tar.xz
android_bootable_recovery-a0732906aedf3c35e3ea21c0902ca237b81d15cc.tar.zst
android_bootable_recovery-a0732906aedf3c35e3ea21c0902ca237b81d15cc.zip
Diffstat (limited to '')
-rw-r--r--fuse_sideload/fuse_provider.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/fuse_sideload/fuse_provider.cpp b/fuse_sideload/fuse_provider.cpp
index 8fa1b5c2e..2183d0844 100644
--- a/fuse_sideload/fuse_provider.cpp
+++ b/fuse_sideload/fuse_provider.cpp
@@ -118,11 +118,16 @@ bool FuseBlockDataProvider::ReadBlockAlignedData(uint8_t* buffer, uint32_t fetch
}
if (uint64_t tailing_bytes = fetch_size % source_block_size_; tailing_bytes != 0) {
- // Calculate the offset to last partial block.
+ // Calculate the offset to last partial block. Two possibilities as below:
+ // 1: fetch_size < source_block_size_, the read_ranges is a blank range_set.
+ // Get the last block num through GetBlockNumber() of the offset block.
+ // 2: fetch_size >= source_block_size_, the last block num is already stored
+ // in read-ranges by GetSubRanges() above.
uint64_t tailing_offset =
read_ranges.value()
? static_cast<uint64_t>((read_ranges->cend() - 1)->second) * source_block_size_
- : static_cast<uint64_t>(start_block) * source_block_size_;
+ : static_cast<uint64_t>(ranges_.GetBlockNumber(offset / source_block_size_)) *
+ source_block_size_;
if (!android::base::ReadFullyAtOffset(fd_, next_out, tailing_bytes, tailing_offset)) {
PLOG(ERROR) << "Failed to read tailing " << tailing_bytes << " bytes at offset "
<< tailing_offset;