commit 898879b988f3bc3aaf3821293e1cf31fdc053fdd
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 20 20:49:56 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 20 20:49:56 2020 +0000
tree 2ca94b76cf1cfd4e3af24b7040dac7c84e687571
parent e43d0df61750bed64145234ec9dbcc19a3fec1db
parent c26a50922e0e43d8f47bee0e5802e7b89807b45a

Merge "Fix out-of-bounds write past end of buckets on long transactions"

libs/binder/tests/binderThroughputTest.cpp

diff --git a/libs/binder/tests/binderThroughputTest.cpp b/libs/binder/tests/binderThroughputTest.cpp
index b790997..3b1faa8 100644
--- a/libs/binder/tests/binderThroughputTest.cpp
+++ b/libs/binder/tests/binderThroughputTest.cpp
@@ -116,7 +116,7 @@
         if (time > max_time_bucket) {
             m_long_transactions++;
         }
-        m_buckets[min(time, max_time_bucket-1) / time_per_bucket] += 1;
+        m_buckets[min((uint32_t)(time / time_per_bucket), num_buckets - 1)] += 1;
         m_best = min(time, m_best);
         m_worst = max(time, m_worst);
         m_transactions += 1;