diff options
| author | Wei Jia <wjia@google.com> | 2015-08-13 18:08:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-13 18:08:00 +0000 |
| commit | 88aa97ea87b7e4f7b4f82df3500754e03205ef60 (patch) | |
| tree | 5da443ca6f2fba132307e3a05e13c4ac45263128 | |
| parent | 4e86a483a12b0139a8babf4754e5de340eaccd40 (diff) | |
| parent | 3ce293842fed1b3abd2ff0aecd2a0c70a55086ee (diff) | |
| download | frameworks_av-88aa97ea87b7e4f7b4f82df3500754e03205ef60.zip frameworks_av-88aa97ea87b7e4f7b4f82df3500754e03205ef60.tar.gz frameworks_av-88aa97ea87b7e4f7b4f82df3500754e03205ef60.tar.bz2 | |
am 3ce29384: libstagefright: fix possible overflow in amrwbenc.
* commit '3ce293842fed1b3abd2ff0aecd2a0c70a55086ee':
libstagefright: fix possible overflow in amrwbenc.
| -rw-r--r-- | media/libstagefright/codecs/amrwbenc/src/util.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/media/libstagefright/codecs/amrwbenc/src/util.c b/media/libstagefright/codecs/amrwbenc/src/util.c index 76ab1b1..333140d 100644 --- a/media/libstagefright/codecs/amrwbenc/src/util.c +++ b/media/libstagefright/codecs/amrwbenc/src/util.c @@ -35,9 +35,10 @@ void Set_zero( ) { Word32 num = (Word32)L; - do{ + while (num > 0) { *x++ = 0; - }while(--num !=0); + --num; + } } @@ -54,20 +55,22 @@ void Copy( ) { Word32 temp1,temp2,num; + if (L <= 0) { + return; + } if(L&1) { temp1 = *x++; *y++ = temp1; } num = (Word32)(L>>1); - temp1 = *x++; - temp2 = *x++; - do{ - *y++ = temp1; - *y++ = temp2; + while (num > 0) { temp1 = *x++; temp2 = *x++; - }while(--num!=0); + *y++ = temp1; + *y++ = temp2; + --num; + } } |