commit 49bf11936cadb96a65a81e71515b1246f55e689a
author Chad Brubaker <cbrubaker@google.com> Fri Oct 09 21:12:53 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 09 21:12:53 2015 +0000
tree a24a9785f8563e85f41d4780c238d003e65040fd
parent 8c02c891b7035199f841890f00f34cbec3c25598
parent d9459157206859d44d68ce908bff359b0d01f51f

Merge "Fix benign overflow in AudioTrackShared"

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.
     }