aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-10-28 21:08:39 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2018-11-18 02:35:03 +0100
commit875a5d055b4ccbe9b9dabab2899ed425f73afcd3 (patch)
treebb60c0eb6a0b4e05ad38d9fe9ccccb1b64e34694
parentc2af767c3e288b63eab873e60c3376b0adcb0186 (diff)
downloadffmpeg-875a5d055b4ccbe9b9dabab2899ed425f73afcd3.tar.gz
avcodec/mpegaudio_parser: Consume more than 0 bytes in case of the unsupported mp3adu case
Fixes: Timeout Fixes: 10966/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MP3ADU_fuzzer-5348695024336896 Fixes: 10969/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MP3ADUFLOAT_fuzzer-5691669402877952 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 df91af140c5543cfbbed187f696e79b554d2c135) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/mpegaudio_parser.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegaudio_parser.c b/libavcodec/mpegaudio_parser.c
index a072851ecf..04400a44e7 100644
--- a/libavcodec/mpegaudio_parser.c
+++ b/libavcodec/mpegaudio_parser.c
@@ -100,7 +100,7 @@ static int mpegaudio_parse(AVCodecParserContext *s1,
"MP3ADU full parser");
*poutbuf = NULL;
*poutbuf_size = 0;
- return 0; /* parsers must not return error codes */
+ return buf_size; /* parsers must not return error codes */
}
break;