commit d9459157206859d44d68ce908bff359b0d01f51f
author Chad Brubaker <cbrubaker@google.com> Wed Sep 23 15:38:29 2015 -0700
committer Chad Brubaker <cbrubaker@google.com> Wed Oct 07 14:49:55 2015 -0700
tree 2ef8b655c98058dcae9e389de4d7108262b5a846
parent de83504563a01201511657d1824fe2e23f1d7916

Fix benign overflow in AudioTrackShared

Bug: 24340611
Change-Id: Idc1e6ae09839475379bf0ab27943ae2de6f80bfa
(cherry picked from commit 0c27d279a1a99d175b84cc530ce2bfb0665b308b)

media/libmedia/AudioTrackShared.cpp

diff --git a/media/libmedia/AudioTrackShared.cpp b/media/libmedia/AudioTrackShared.cpp
index 151a81e..a5b516c 100644
--- a/media/libmedia/AudioTrackShared.cpp
+++ b/media/libmedia/AudioTrackShared.cpp
@@ -38,7 +38,7 @@
 // In general, this means (new_self) returned is max(self, other) + 1.
 
 static uint32_t incrementSequence(uint32_t self, uint32_t other) {
-    int32_t diff = self - other;
+    int32_t diff = (int32_t) self - other;
     if (diff >= 0 && diff < INT32_MAX) {
         return self + 1; // we're already ahead of other.
     }