commit 4b7b5986f66ec57bc6acd07d99a1d484f4a7426e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon May 01 19:46:33 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 01 19:46:33 2023 +0000
tree dae27172d03ff0737f72e3e717012780b4ec8a3f
parent f20c0ddd095013f983d0f73aee0285331bfae4e3
parent 50a5f15f5fb4b7aea96172851f3bff89b99d70ae

Merge "Fix the overflow when converting current time to milliseconds on 32bit system"

identity/CredentialData.cpp

diff --git a/identity/CredentialData.cpp b/identity/CredentialData.cpp
index 1bf1527..803e671 100644
--- a/identity/CredentialData.cpp
+++ b/identity/CredentialData.cpp
@@ -520,8 +520,12 @@
                                           bool allowUsingExpiredKeys) {
     AuthKeyData* candidate = nullptr;
 
-    int64_t nowMilliSeconds =
-        std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()) * 1000;
+    time_t now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
+    int64_t nowMilliSeconds;
+    if (__builtin_mul_overflow(int64_t(now), int64_t(1000), &nowMilliSeconds)) {
+        LOG(ERROR) << "Overflow converting " << now << " to milliseconds";
+        return nullptr;
+    }
 
     int n = 0;
     for (AuthKeyData& data : authKeyDatas_) {