diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-02-24 19:04:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-17 20:35:19 +0200 |
| commit | 90f7b5fd16a684ac2c25e96741144772fa0e0dd9 (patch) | |
| tree | 37762fd3572fe4a2ec51b679bfe4f39c294648e5 | |
| parent | 7aaac74f58ce5e2ed9a48b66e8806e383f3495b0 (diff) | |
| download | ffmpeg-90f7b5fd16a684ac2c25e96741144772fa0e0dd9.tar.gz | |
avcodec/mpegaudiodec_template: Correct return code on id3 tag discarding
Fixes: 665/clusterfuzz-testcase-4863789881098240
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 5d81616be332cca99304d0b747c2c8e2d719f349)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/mpegaudiodec_template.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c index 5e3fe7e986..72f0613b7a 100644 --- a/libavcodec/mpegaudiodec_template.c +++ b/libavcodec/mpegaudiodec_template.c @@ -1663,7 +1663,7 @@ static int decode_frame(AVCodecContext * avctx, void *data, int *got_frame_ptr, header = AV_RB32(buf); if (header>>8 == AV_RB32("TAG")>>8) { av_log(avctx, AV_LOG_DEBUG, "discarding ID3 tag\n"); - return buf_size; + return buf_size + skipped; } ret = avpriv_mpegaudio_decode_header((MPADecodeHeader *)s, header); if (ret < 0) { |