diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index ef884934e1..d0971741cd 100644
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -91,7 +91,7 @@ static int mp3_read_probe(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;