avcodec/mpegaudiodec_template: Correct return code on id3 tag discarding
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 24 Feb 2017 18:04:12 +0000 (19:04 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 24 Feb 2017 21:23:53 +0000 (22:23 +0100)
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>
libavcodec/mpegaudiodec_template.c

index 33f2a14..a389318 100644 (file)
@@ -1665,7 +1665,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) {