| commit | bc8c47e13630ce7cc26f50cfcdfbcd75eb83c754 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Dec 09 12:49:08 2015 -0800 |
| committer | Marco Nelissen <marcone@google.com> | Wed Dec 09 12:49:08 2015 -0800 |
| tree | 0da738e7a3c4bf67fc07f00db9f048f7c1d04cbb | |
| parent | 5d5c3a132bb446ac78a37dfaac24a46cacf0dd73 [diff] |
Fix overflow in amrwbenc This got dropped in a previous merge. Change-Id: Ic5ec1f6662944deee32e740697fc55774c894033
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 @@ 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; }