diff options
| author | Tianjie Xu <xunchang@google.com> | 2019-01-30 00:52:19 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-30 00:52:19 +0100 |
| commit | d8063b0af47ffa47db80375fb924832206b8aa40 (patch) | |
| tree | 83e3cac653338c84e2fe5c0f2c058ce252263afe | |
| parent | [automerger skipped] Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency""" am: 5342de92e0 -s ours (diff) | |
| parent | Merge "Fix potential size overflow in blockimg.cpp" (diff) | |
| download | android_bootable_recovery-d8063b0af47ffa47db80375fb924832206b8aa40.tar android_bootable_recovery-d8063b0af47ffa47db80375fb924832206b8aa40.tar.gz android_bootable_recovery-d8063b0af47ffa47db80375fb924832206b8aa40.tar.bz2 android_bootable_recovery-d8063b0af47ffa47db80375fb924832206b8aa40.tar.lz android_bootable_recovery-d8063b0af47ffa47db80375fb924832206b8aa40.tar.xz android_bootable_recovery-d8063b0af47ffa47db80375fb924832206b8aa40.tar.zst android_bootable_recovery-d8063b0af47ffa47db80375fb924832206b8aa40.zip | |
| -rw-r--r-- | updater/blockimg.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp index 6e5d5bb55..07c3c7b52 100644 --- a/updater/blockimg.cpp +++ b/updater/blockimg.cpp @@ -1525,7 +1525,7 @@ static int PerformCommandComputeHashTree(CommandParameters& params) { // Starts the hash_tree computation. HashTreeBuilder builder(BLOCKSIZE, hash_function); - if (!builder.Initialize(source_ranges.blocks() * BLOCKSIZE, salt)) { + if (!builder.Initialize(static_cast<int64_t>(source_ranges.blocks()) * BLOCKSIZE, salt)) { LOG(ERROR) << "Failed to initialize hash tree computation, source " << source_ranges.ToString() << ", salt " << salt_hex; return -1; @@ -1915,8 +1915,10 @@ pbiudone: const char* partition = strrchr(blockdev_filename->data.c_str(), '/'); if (partition != nullptr && *(partition + 1) != 0) { - fprintf(cmd_pipe, "log bytes_written_%s: %zu\n", partition + 1, params.written * BLOCKSIZE); - fprintf(cmd_pipe, "log bytes_stashed_%s: %zu\n", partition + 1, params.stashed * BLOCKSIZE); + fprintf(cmd_pipe, "log bytes_written_%s: %" PRIu64 "\n", partition + 1, + static_cast<uint64_t>(params.written) * BLOCKSIZE); + fprintf(cmd_pipe, "log bytes_stashed_%s: %" PRIu64 "\n", partition + 1, + static_cast<uint64_t>(params.stashed) * BLOCKSIZE); fflush(cmd_pipe); } // Delete stash only after successfully completing the update, as it may contain blocks needed |