Merge "stagefright aacenc: Safeguard against overwriting bits"

williamsheet · Feb 29, 2012 · 69aae36 · 69aae36
2 parents d7fa7de + f4e98ba
commit 69aae36
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/media/libstagefright/codecs/aacenc/src/bitbuffer.c b/media/libstagefright/codecs/aacenc/src/bitbuffer.c
@@ -152,6 +152,7 @@ Word16 WriteBits(HANDLE_BIT_BUF hBitBuf,
 
   wBitPos = hBitBuf->wBitPos;
   wBitPos += noBitsToWrite;
+  writeValue &= ~(0xffffffff << noBitsToWrite); // Mask out everything except the lowest noBitsToWrite bits
   writeValue <<= 32 - wBitPos;
   writeValue |= hBitBuf->cache;