commit 6c1f1cb5bd2b22f8b21b78ea020a0b6370f5b9ff
author Jean-Baptiste Queru <jbq@google.com> Thu Mar 01 15:35:23 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 01 15:35:23 2012 -0800
tree 9f4bce8f4789d27c4ca0c3e0326ad4e03dce103a
parent c795b64060c3af9d7961fc1371e4ccfa8ee3e450
parent 769501aad4e1c69af713b27dada849f99db22914

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

* commit '715c78b933f8dec04882ebb73acd61fdd42c6c64':
  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;