diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-28 11:42:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-08-04 16:17:01 +0200 |
| commit | 40c2f870aec923894692752718193404151b17b2 (patch) | |
| tree | 6fe12972af16c84c577104c9e02180d326a6925f /libavcodec/aacdec_template.c | |
| parent | 47db5763e21c5e3b0ddde2430d15938f8d88480d (diff) | |
| download | ffmpeg-streaming-40c2f870aec923894692752718193404151b17b2.zip ffmpeg-streaming-40c2f870aec923894692752718193404151b17b2.tar.gz | |
avcodec/aacdec_template: Check for duplicate elements
Fixes: Timeout
Fixes: 9552/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_FIXED_fuzzer-6027842339995648
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/aacdec_template.c')
| -rw-r--r-- | libavcodec/aacdec_template.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index 0c89928..b60b31a 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -3122,6 +3122,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data, int samples = 0, multiplier, audio_found = 0, pce_found = 0; int is_dmono, sce_count = 0; int payload_alignment; + uint8_t che_presence[4][MAX_ELEM_ID] = {{0}}; ac->frame = data; @@ -3159,6 +3160,14 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data, } if (elem_type < TYPE_DSE) { + if (che_presence[elem_type][elem_id]) { + av_log(ac->avctx, AV_LOG_ERROR, "channel element %d.%d duplicate\n", + elem_type, elem_id); + err = AVERROR_INVALIDDATA; + goto fail; + } + che_presence[elem_type][elem_id] = 1; + if (!(che=get_che(ac, elem_type, elem_id))) { av_log(ac->avctx, AV_LOG_ERROR, "channel element %d.%d is not allocated\n", elem_type, elem_id); |
