Fixes: regression Fixes: Ticket8511
Unified · Split
| @@ -87,20 +87,26 @@ static int mp3_read_probe(const AVProbeData *p) · 86 unmodified lines | ||
| 87 | 87 | for (framesizes = frames = 0; buf2 < end; frames++) { |
| 88 | 88 | MPADecodeHeader h; |
| 89 | 89 | int header_emu = 0; |
| 90 | + int available; | |
| 90 | 91 | |
| 91 | 92 | header = AV_RB32(buf2); |
| 92 | 93 | ret = avpriv_mpegaudio_decode_header(&h, header); |
| 93 | − if (ret != 0 || end - buf2 < h.frame_size) | |
| 94 | + if (ret != 0) | |
| 94 | 95 | break; |
| 95 | 96 | |
| 96 | − for (buf3 = buf2 + 4; buf3 < buf2 + h.frame_size; buf3++) { | |
| 97 | + available = FFMIN(h.frame_size, end - buf2); | |
| 98 | + for (buf3 = buf2 + 4; buf3 < buf2 + available; buf3++) { | |
| 97 | 99 | uint32_t next_sync = AV_RB32(buf3); |
| 98 | 100 | header_emu += (next_sync & MP3_MASK) == (header & MP3_MASK); |
| 99 | 101 | } |
| 100 | 102 | if (header_emu > 2) |
| 101 | 103 | break; |
| 102 | − buf2 += h.frame_size; | |
| 103 | 104 | framesizes += h.frame_size; |
| 105 | + if (available < h.frame_size) { | |
| 106 | + frames++; | |
| 107 | + break; | |
| 108 | + } | |
| 109 | + buf2 += h.frame_size; | |
| 104 | 110 | } |
| 105 | 111 | max_frames = FFMAX(max_frames, frames); |
| 106 | 112 | max_framesizes = FFMAX(max_framesizes, framesizes); |