Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy"

2012-05-25 10:38:05 -07:00
parent fd63c85742 9af8cfa60f
commit 23cad6eb2b
1 changed files with 2 additions and 2 deletions
--- 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;