diff options
| author | Ray Essick <essick@google.com> | 2020-09-30 19:04:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-30 19:04:47 +0000 |
| commit | f901ed5fe7e55b1321d080e03e105c9f4d954de9 (patch) | |
| tree | dd8dacfed8a460716cbf9891a3f5ce289666f06a | |
| parent | 3cb8890af35845b9f17b1280f9cc17ad99a845d4 (diff) | |
| parent | 207c438c0c52a1800ac0aad73e1e8b529cbf5d20 (diff) | |
| download | libxaac-f901ed5fe7e55b1321d080e03e105c9f4d954de9.tar.gz | |
Merge "Fix to handle segv in impd_filter_banks_process" am: e5c5475c98 am: 060e1f9a11 am: 3ed0b59dc6 am: 207c438c0c
Original change: https://android-review.googlesource.com/c/platform/external/libxaac/+/1425116
Change-Id: Ia30b464c94373a5dc8e2f19d61e517349720f884
| -rw-r--r-- | decoder/drc_src/impd_drc_dynamic_payload.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/decoder/drc_src/impd_drc_dynamic_payload.c b/decoder/drc_src/impd_drc_dynamic_payload.c index a8a15a9..f8a1aa9 100644 --- a/decoder/drc_src/impd_drc_dynamic_payload.c +++ b/decoder/drc_src/impd_drc_dynamic_payload.c @@ -231,6 +231,8 @@ WORD32 impd_dec_times(ia_bit_buf_struct* it_bit_buff, } } node_time_tmp = time_offs + time_delta * delta_tmin; + if (node_time_tmp >= (2 * AUDIO_CODEC_FRAME_SIZE_MAX - drc_frame_size)) + return UNEXPECTED_ERROR; if (node_time_tmp > drc_frame_size + time_offset) { if (node_res_flag == 0) { str_node[k].time = drc_frame_size + time_offset; |