commit 034c20eab5e5d13591278bd415ea78fe0bb779b7
author Robert Shih <robertshih@google.com> Tue Mar 29 18:43:46 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 29 18:43:46 2016 +0000
tree 271f0dce37885b735a6a26b91afe3e5c5f225957
parent 96116791e9f4d74d2f941a22b6d3ec99e6b6ed6e
parent afe8d851a19f10f86726591bb684ecb515ac6974

Merge "stagefright: fix ABitReader integer over/underflow" into nyc-dev

media/libstagefright/foundation/ABitReader.cpp

diff --git a/media/libstagefright/foundation/ABitReader.cpp b/media/libstagefright/foundation/ABitReader.cpp
index beb5cc0..1582b67 100644
--- a/media/libstagefright/foundation/ABitReader.cpp
+++ b/media/libstagefright/foundation/ABitReader.cpp
@@ -114,7 +114,7 @@
         return false;
     }
 
-    ssize_t numBitsRemaining = n - mNumBitsLeft;
+    ssize_t numBitsRemaining = (ssize_t)n - (ssize_t)mNumBitsLeft;
 
     size_t size = mSize;
     const uint8_t *data = mData;