aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-11-07 21:16:32 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2019-12-31 19:51:56 +0100
commit3a91eb37c496099df24e25a42b561028cb56bb6c (patch)
tree0ee935fbe596938e390094f59cbeb55c30db1fe7
parent1c24ab39b6d46685d619a7b22d8da970ea8606db (diff)
downloadffmpeg-3a91eb37c496099df24e25a42b561028cb56bb6c.tar.gz
avformat/mp3dec: Check that the frame fits within the probe buffer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit e9a335150a62bb377a26ce096187b4476145d02b) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/mp3dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index 258f19174b..6848415657 100644
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -91,7 +91,7 @@ static int mp3_read_probe(const AVProbeData *p)
header = AV_RB32(buf2);
ret = avpriv_mpegaudio_decode_header(&h, header);
- if (ret != 0)
+ if (ret != 0 || end - buf2 < h.frame_size)
break;
buf2 += h.frame_size;
framesizes += h.frame_size;