commit 6492a6abf64b54b73833907306203871c66b6932
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 14 20:47:23 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 14 20:47:23 2020 +0000
tree 69cb65be1fe2dd458dfaa1100c42fc67d43e1772
parent f9510e32625ba37d7a7590e20232154f689a621a
parent 5d0aaaf8e0b111e751bc5de8b70f0996927ddcac

Merge "Fix the overflow issue in Checkpoint"

Checkpoint.cpp

diff --git a/Checkpoint.cpp b/Checkpoint.cpp
index 88f7cad..df5fc88 100644
--- a/Checkpoint.cpp
+++ b/Checkpoint.cpp
@@ -320,13 +320,13 @@
         uint64_t free_bytes = 0;
         if (is_fs_cp) {
             statvfs(mnt_pnt.c_str(), &data);
-            free_bytes = data.f_bavail * data.f_frsize;
+            free_bytes = ((uint64_t) data.f_bavail) * data.f_frsize;
         } else {
             std::string bow_device = fs_mgr_find_bow_device(blk_device);
             if (!bow_device.empty()) {
                 std::string content;
                 if (android::base::ReadFileToString(bow_device + "/bow/free", &content)) {
-                    free_bytes = std::strtoul(content.c_str(), NULL, 10);
+                    free_bytes = std::strtoull(content.c_str(), NULL, 10);
                 }
             }
         }