commit 769501aad4e1c69af713b27dada849f99db22914
author Jean-Baptiste Queru <jbq@google.com> Wed Feb 29 15:44:28 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 29 15:44:28 2012 -0800
tree 139c5400dd85eac7f0f21a96d97a1191c9551b69
parent 279612dd95acc127e41b8a7aa3277f3ffacaa849
parent de99ee3d507bf1284fdb5d6b84a32f4227f16a6f

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

* commit '69aae36e900cf7114c5895618747906951a11730':
  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;