Message ID | 20180517234838.19496-1-michael@niedermayer.cc |
---|---|
State | Accepted |
Commit | f77eee67e25b13e32e899efb6fdf01719914353e |
Headers | show |
On Fri, May 18, 2018 at 01:48:38AM +0200, Michael Niedermayer wrote: > Fixes: Infinite loop > Fixes: 7669/clusterfuzz-testcase-ffmpeg_AV_CODEC_ID_AC3_FIXED_fuzzer-4689042185650176 > Fixes: 7670/clusterfuzz-testcase-ffmpeg_AV_CODEC_ID_AC3_fuzzer-4706306762997760 > Fixes: 7672/clusterfuzz-testcase-ffmpeg_AV_CODEC_ID_EAC3_fuzzer-4702108499574784 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/ac3dec.c | 3 +++ > 1 file changed, 3 insertions(+) will apply [...]
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index b14d2e74ac..1d3180b935 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -1800,6 +1800,9 @@ dependent_frame: *got_frame_ptr = 1; + if (!s->superframe_size) + return FFMIN(full_buf_size, s->frame_size); + return FFMIN(full_buf_size, s->superframe_size); }
Fixes: Infinite loop Fixes: 7669/clusterfuzz-testcase-ffmpeg_AV_CODEC_ID_AC3_FIXED_fuzzer-4689042185650176 Fixes: 7670/clusterfuzz-testcase-ffmpeg_AV_CODEC_ID_AC3_fuzzer-4706306762997760 Fixes: 7672/clusterfuzz-testcase-ffmpeg_AV_CODEC_ID_EAC3_fuzzer-4702108499574784 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/ac3dec.c | 3 +++ 1 file changed, 3 insertions(+)