commit dd1fafd81ed6d9cd1d424c8f12c24d72f2666a4c
author Treehugger Robot <treehugger-gerrit@google.com> Tue Apr 07 23:23:12 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 07 23:23:12 2020 +0000
tree 7fc2c7788c5358d2ed528127309383b2c9f3e511
parent b3358b86368d4b4bd52bf5ab1b9495c39465b435
parent cd4c724043bb6ce562fdb02bb980fde548233353

Merge "fix audioflinger integer multiplication overflow"

services/audioflinger/FastThread.cpp

diff --git a/services/audioflinger/FastThread.cpp b/services/audioflinger/FastThread.cpp
index 8b7a124..47fe0b3 100644
--- a/services/audioflinger/FastThread.cpp
+++ b/services/audioflinger/FastThread.cpp
@@ -309,7 +309,7 @@
                     // compute the delta value of clock_gettime(CLOCK_MONOTONIC)
                     uint32_t monotonicNs = nsec;
                     if (sec > 0 && sec < 4) {
-                        monotonicNs += sec * 1000000000;
+                        monotonicNs += sec * 1000000000U; // unsigned to prevent signed overflow.
                     }
                     // compute raw CPU load = delta value of clock_gettime(CLOCK_THREAD_CPUTIME_ID)
                     uint32_t loadNs = 0;
@@ -325,7 +325,7 @@
                             }
                             loadNs = nsec;
                             if (sec > 0 && sec < 4) {
-                                loadNs += sec * 1000000000;
+                                loadNs += sec * 1000000000U; // unsigned to prevent signed overflow.
                             }
                         } else {
                             // first time through the loop