| commit | b1ac89483263297e040914c6bdf30d80a4be8255 | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Mon Nov 09 19:20:55 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 09 19:20:55 2020 +0000 |
| tree | 4ba7cd54af19ab7dcecedb18e8f79794fff07793 | |
| parent | f247c8e91099b818b7ccc85bec950588e3028862 [diff] | |
| parent | e7e87e61aa96ba774b9fe07d5fd8021eadf9f69c [diff] |
Merge "Fix signed integer overflow" am: 9943091884 am: f0292e9014 am: e7e87e61aa Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1487116 Change-Id: I1db619dc62e89fbd9d00a14c4eb7141e715f16a0
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index c5d1cc7..464f876 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp
@@ -7435,7 +7435,7 @@ (framesRead - part1) * mFrameSize); } } - rear = mRsmpInRear += framesRead; + mRsmpInRear = audio_utils::safe_add_overflow(mRsmpInRear, (int32_t)framesRead); size = activeTracks.size();