commit 85ee025ddb807786422ea053ae23147bfedbcdd2
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Nov 15 10:37:20 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 15 10:37:20 2023 +0000
tree 2d328cca831ff06f5b3def592912b8bdd22c850a
parent e992ba89991229b19906f7308392532ed06851fd
parent bbddde0cce652ccd4e4fb21dc6b47349143ac72b

Merge "Fix AudioFlinger crash after playing overnight." into main

services/audioflinger/Tracks.cpp

diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp
index 75d885d..93bacd9 100644
--- a/services/audioflinger/Tracks.cpp
+++ b/services/audioflinger/Tracks.cpp
@@ -450,6 +450,10 @@
     if (*_aidl_return != OK) {
         return Status::ok();
     }
+
+    // restrict position modulo INT_MAX to avoid integer sanitization abort
+    legacy.mPosition &= INT_MAX;
+
     *timestamp = legacy2aidl_AudioTimestamp_AudioTimestampInternal(legacy).value();
     return Status::ok();
 }