har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/amrnbdec: move channel_size bellow to avoid array overreads

Browse Source
This commit is contained in:
Paul B Mahol 2021-10-03 12:07:13 +02:00
parent 17130321f3
commit a97cad8b0b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/amrnbdec.c
View File

@ -981,7 +981,6 @@ static int amrnb_decode_frame(AVCodecContext *avctx, void *data,
int i, subframe; int i, subframe;
p->cur_frame_mode = unpack_bitstream(p, buf, buf_size); p->cur_frame_mode = unpack_bitstream(p, buf, buf_size);
channel_size = frame_sizes_nb[p->cur_frame_mode] + 1; // +7 for rounding and +8 for TOC
if (p->cur_frame_mode == NO_DATA) { if (p->cur_frame_mode == NO_DATA) {
av_log(avctx, AV_LOG_ERROR, "Corrupt bitstream\n"); av_log(avctx, AV_LOG_ERROR, "Corrupt bitstream\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -992,6 +991,7 @@ static int amrnb_decode_frame(AVCodecContext *avctx, void *data,
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
channel_size = frame_sizes_nb[p->cur_frame_mode] + 1; // +7 for rounding and +8 for TOC
if (p->cur_frame_mode == MODE_12k2) { if (p->cur_frame_mode == MODE_12k2) {
lsf2lsp_5(p); lsf2lsp_5(p);
} else } else