diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-29 14:23:38 -0800 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-02-29 14:23:38 -0800 |
| commit | de99ee3d507bf1284fdb5d6b84a32f4227f16a6f (patch) | |
| tree | 289ec7b4e0f7131ccd9a064eb1e32955463cfb9a /media/libstagefright/codecs/aacenc | |
| parent | bc303ed5fd25228b8523adbfcc9c007e73bc04ea (diff) | |
| parent | 3989d5c21ce6d1f3492c9e5484d610d5d66abd9e (diff) | |
| download | frameworks_av-de99ee3d507bf1284fdb5d6b84a32f4227f16a6f.zip frameworks_av-de99ee3d507bf1284fdb5d6b84a32f4227f16a6f.tar.gz frameworks_av-de99ee3d507bf1284fdb5d6b84a32f4227f16a6f.tar.bz2 | |
Merge "stagefright aacenc: Safeguard against overwriting bits"
Diffstat (limited to 'media/libstagefright/codecs/aacenc')
| -rw-r--r-- | media/libstagefright/codecs/aacenc/src/bitbuffer.c | 1 |
1 files changed, 1 insertions, 0 deletions
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 @@ 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; |