diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-09 21:21:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-31 19:51:57 +0100 |
| commit | fe04b47cea6ac190abdd627c8121d7ec3fabc18a (patch) | |
| tree | 0457225eb6ab3982e2025a7d05123483b9d36c30 | |
| parent | 3292f6c6becc0209893fe0cdb01ecd3a207a8040 (diff) | |
| download | ffmpeg-fe04b47cea6ac190abdd627c8121d7ec3fabc18a.tar.gz | |
avcodec/g729dec: Avoid using buf_size
buf_size is not updated as buf is advanced so it is wrong after the first
iteration
Fixes: Timeout (160sec -> 27sec)
Fixes: 18658/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G729_fuzzer-5729784269373440
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 336f9461df7d2005db9d1af4f5f81fd033025ce2)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/g729dec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c index ddcc616c84..222d6014b6 100644 --- a/libavcodec/g729dec.c +++ b/libavcodec/g729dec.c @@ -452,11 +452,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, int is_periodic = 0; ///< whether one of the subframes is declared as periodic or not out_frame = (int16_t*)frame->data[c]; - for (i = 0; i < buf_size; i++) + for (i = 0; i < format->block_size; i++) frame_erasure |= buf[i]; frame_erasure = !frame_erasure; - init_get_bits(&gb, buf, 8*buf_size); + init_get_bits(&gb, buf, 8*format->block_size); ma_predictor = get_bits(&gb, 1); quantizer_1st = get_bits(&gb, VQ_1ST_BITS); |