diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-02-26 18:38:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-02-28 19:40:05 +0100 |
| commit | 23645f95ec0ae3f4ccc8ad2b23d1fbb16575ae16 (patch) | |
| tree | 0568ddf291c2df9c570460081365748afd893e78 /libavformat/mp3dec.c | |
| parent | dfa1fc17a54a31e51f36f1f764dfdc76062ffe78 (diff) | |
avformat/mp3dec: Count last partial frame in probe.
Fixes: regression
Fixes: Ticket8511
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/mp3dec.c')
| -rw-r--r-- | libavformat/mp3dec.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 71a4ed706d..b044679c02 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -87,20 +87,26 @@ static int mp3_read_probe(const AVProbeData *p) for (framesizes = frames = 0; buf2 < end; frames++) { MPADecodeHeader h; int header_emu = 0; + int available; header = AV_RB32(buf2); ret = avpriv_mpegaudio_decode_header(&h, header); - if (ret != 0 || end - buf2 < h.frame_size) + if (ret != 0) break; - for (buf3 = buf2 + 4; buf3 < buf2 + h.frame_size; buf3++) { + available = FFMIN(h.frame_size, end - buf2); + for (buf3 = buf2 + 4; buf3 < buf2 + available; buf3++) { uint32_t next_sync = AV_RB32(buf3); header_emu += (next_sync & MP3_MASK) == (header & MP3_MASK); } if (header_emu > 2) break; - buf2 += h.frame_size; framesizes += h.frame_size; + if (available < h.frame_size) { + frames++; + break; + } + buf2 += h.frame_size; } max_frames = FFMAX(max_frames, frames); max_framesizes = FFMAX(max_framesizes, framesizes); |