| commit | 92815c706a6bc184d6fb3fe0765af366274b21fd | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Nov 06 11:12:12 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 06 11:12:12 2024 +0000 |
| tree | c8677dbe1a80a3f6bb0cf2bdb5a704fb0611d43b | |
| parent | a65f33176207cb9c372b6fcca5266cdb174f7c56 [diff] | |
| parent | 4ebe585454ff49df28d93e6fb45d66f4514e2a4c [diff] |
Merge "snapuserd: typecast cow_op->new_block to uint64_t" into main am: 41e9d7d3a2 am: 4ebe585454 Original change: https://android-review.googlesource.com/c/platform/system/core/+/3337165 Change-Id: I05b95de82a17224229250590a6e82d61284f9a4c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp index e2c5874..486548c 100644 --- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp +++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp
@@ -55,7 +55,7 @@ break; } - *source_offset = cow_op->new_block * BLOCK_SZ; + *source_offset = static_cast<uint64_t>(cow_op->new_block) * BLOCK_SZ; if (!checkOrderedOp) { replace_zero_vec->push_back(cow_op); if (cow_op->type() == kCowReplaceOp) { @@ -74,7 +74,7 @@ break; } - uint64_t next_offset = op->new_block * BLOCK_SZ; + uint64_t next_offset = static_cast<uint64_t>(op->new_block) * BLOCK_SZ; if (next_offset != (*source_offset + nr_consecutive * BLOCK_SZ)) { break; }