commit | b135d0e6fb57a810882a1488cb0ff670d0e25219 | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Wed Dec 09 20:50:27 2015 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Dec 09 20:50:27 2015 +0000 |
tree | 0da738e7a3c4bf67fc07f00db9f048f7c1d04cbb | |
parent | e491d0baa3ed0977182372d84343f5a4025b31cb [diff] | |
parent | bc8c47e13630ce7cc26f50cfcdfbcd75eb83c754 [diff] |
Merge "Fix overflow in amrwbenc"
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; }