| commit | c399c62c7adfcc33c0b7a5653aee58e754c59c04 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Apr 25 23:30:54 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Apr 25 23:30:54 2020 +0000 |
| tree | 8bf4fdfddce8015580d7526c3c5c0f62fa889db5 | |
| parent | 7d46c0b6f332d0c8e5d100840c1142bfc4be0643 [diff] | |
| parent | a27e70cdba2eee349cf7f97d178c80082cfd4dfd [diff] |
Merge "AMRWB: Add bounds check for mode in pvDecoder_AmrWb()" into rvc-dev
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;