| commit | 98f296ec70776d5c00efe2688a8b6d2f7540d4b0 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Nov 15 11:19:11 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 15 11:19:11 2023 +0000 |
| tree | 1681c03e1436db2338d5232acc36424549c4c43b | |
| parent | 27433aa5b874c573974cf2d35675a51fddcef964 [diff] | |
| parent | 85ee025ddb807786422ea053ae23147bfedbcdd2 [diff] |
Merge "Fix AudioFlinger crash after playing overnight." into main am: 85ee025ddb Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2827570 Change-Id: Id452a4fdf31aea8154312f74b09b66357f7c4bb1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index 6ebc699..37d3e4e 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(); }