| commit | e7e87e61aa96ba774b9fe07d5fd8021eadf9f69c | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Mon Nov 09 18:52:25 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 09 18:52:25 2020 +0000 |
| tree | ba2c1b1988d9a50b8e5216d01ab82e3bb1db88f3 | |
| parent | 43a8addf9fa3e8eb3553faaa529812da684cae77 [diff] | |
| parent | f0292e9014cadb4e1222ef5c7a4281828101d395 [diff] |
Merge "Fix signed integer overflow" am: 9943091884 am: f0292e9014 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1487116 Change-Id: Ief663bcc34dddadea932488ba1aaac0ea2718fd9
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 384ddb5..b143388 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp
@@ -7429,7 +7429,7 @@ (framesRead - part1) * mFrameSize); } } - rear = mRsmpInRear += framesRead; + mRsmpInRear = audio_utils::safe_add_overflow(mRsmpInRear, (int32_t)framesRead); size = activeTracks.size();