commit 715c78b933f8dec04882ebb73acd61fdd42c6c64
author Jean-Baptiste Queru <jbq@google.com> Wed Feb 29 15:51:19 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 29 15:51:19 2012 -0800
tree d493a85c171a22962b46584e75a0547c85eacb40
parent 4917bc104da1725d7ba093713de3802dec1515e5
parent 225eec8d2a1b63dfb57bcdcf3a72ab755f0e5525

am 225eec8d: am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"

* commit '225eec8d2a1b63dfb57bcdcf3a72ab755f0e5525':
  stagefright aacenc: Safeguard against overwriting bits

media/libstagefright/codecs/aacenc/src/bitbuffer.c

diff --git a/media/libstagefright/codecs/aacenc/src/bitbuffer.c b/media/libstagefright/codecs/aacenc/src/bitbuffer.c
index a706893..0ce93d3 100644
--- a/media/libstagefright/codecs/aacenc/src/bitbuffer.c
+++ b/media/libstagefright/codecs/aacenc/src/bitbuffer.c
@@ -152,6 +152,7 @@
 
   wBitPos = hBitBuf->wBitPos;
   wBitPos += noBitsToWrite;
+  writeValue &= ~(0xffffffff << noBitsToWrite); // Mask out everything except the lowest noBitsToWrite bits
   writeValue <<= 32 - wBitPos;
   writeValue |= hBitBuf->cache;