diff options
| author | 2012-05-25 10:38:05 -0700 | |
|---|---|---|
| committer | 2012-05-25 10:38:06 -0700 | |
| commit | 23cad6eb2b42f023a8f2197cd358de87f9084b99 (patch) | |
| tree | 10e36848117787348d606ed650df9e820de2d191 | |
| parent | fd63c85742f4b12065418d48ae10be4bb12468f5 (diff) | |
| parent | 9af8cfa60f7c0d51e667d62465b6f9eb7d425e1d (diff) | |
Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy"
| -rw-r--r-- | media/libstagefright/codecs/aacenc/basic_op/oper_32b.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/aacenc/basic_op/oper_32b.c b/media/libstagefright/codecs/aacenc/basic_op/oper_32b.c index 982f4fd44e6d..cc019271c158 100644 --- a/media/libstagefright/codecs/aacenc/basic_op/oper_32b.c +++ b/media/libstagefright/codecs/aacenc/basic_op/oper_32b.c @@ -344,8 +344,8 @@ static const Word32 pow2Table[POW2_TABLE_SIZE] = { */ Word32 pow2_xy(Word32 x, Word32 y) { - Word32 iPart; - Word32 fPart; + UWord32 iPart; + UWord32 fPart; Word32 res; Word32 tmp, tmp2; Word32 shift, shift2; |