| commit | 0080df7ca32457355beb7bd401c9b049d4fe1af5 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Apr 25 23:48:14 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Apr 25 23:48:14 2020 +0000 |
| tree | 7eac05c6bcb9147dde6e08a8a89894f3d10dbc35 | |
| parent | 9447d2f58f589056e38d9eec9059b434f733e323 [diff] | |
| parent | 0c83eb82e9dc82cea75b35f16b492a0b04ed4817 [diff] |
Merge "AMRWB: Add bounds check for mode in pvDecoder_AmrWb()" into rvc-dev am: c399c62c7a am: 0c83eb82e9 Change-Id: I1ff6856f6621c70c9467b499a46cdb9f15aa2d6b
diff --git a/media/libstagefright/codecs/amrwb/src/pvamrwbdecoder.cpp b/media/libstagefright/codecs/amrwb/src/pvamrwbdecoder.cpp index ddc818e..c9c1cd4 100644 --- a/media/libstagefright/codecs/amrwb/src/pvamrwbdecoder.cpp +++ b/media/libstagefright/codecs/amrwb/src/pvamrwbdecoder.cpp
@@ -337,7 +337,10 @@ st = (Decoder_State *) spd_state; /* mode verification */ - + if (mode < 0 || mode >= NUM_OF_MODES) + { + return (-1); + } nb_bits = AMR_WB_COMPRESSED[mode]; *frame_length = AMR_WB_PCM_FRAME;