commit 41e9d7d3a2afb78c32274ae530d3cbca444d0314
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Nov 06 10:15:46 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 06 10:15:46 2024 +0000
tree 91c0684aa54acfaa7b63a12cfcd183349b6a9938
parent 71707037b1fa91fa376e4b173fad5b32eb183730
parent 01af5431f7b4353706527477aaa3118476e5b8a2

Merge "snapuserd: typecast cow_op->new_block to uint64_t" into main

fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp

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;
                 }