diff options
| author | Marco Nelissen <marcone@google.com> | 2015-12-09 12:49:08 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-01-08 21:46:45 -0800 |
| commit | fcd3c6e19c212ba050ffbe6384ff69f3864aba1b (patch) | |
| tree | f7e9f8cc5643d693218e7bd143e919153b600901 /media/libstagefright/codecs | |
| parent | 60fc86704079b6c7d777bf5719f289a940737ffe (diff) | |
| download | frameworks_av-fcd3c6e19c212ba050ffbe6384ff69f3864aba1b.zip frameworks_av-fcd3c6e19c212ba050ffbe6384ff69f3864aba1b.tar.gz frameworks_av-fcd3c6e19c212ba050ffbe6384ff69f3864aba1b.tar.bz2 | |
Fix overflow in amrwbenc
This got dropped in a previous merge.
Change-Id: Ic5ec1f6662944deee32e740697fc55774c894033
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/amrwbenc/src/preemph.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/amrwbenc/src/preemph.c b/media/libstagefright/codecs/amrwbenc/src/preemph.c index 99a1844..70c8650 100644 --- a/media/libstagefright/codecs/amrwbenc/src/preemph.c +++ b/media/libstagefright/codecs/amrwbenc/src/preemph.c @@ -74,6 +74,9 @@ void Preemph2( L_tmp = INT32_MAX / 2; } L_tmp = (L_tmp << 1); + if (L_tmp > INT32_MAX - 0x8000) { + L_tmp = INT32_MAX - 0x8000; + } x[i] = (L_tmp + 0x8000)>>16; } |