[FFmpeg-devel] [PATCH v2 7/8] avformat/wavdec: fix s337m/spdif probing beyond data_end

Nicolas Gaullier nicolas.gaullier at cji.paris
Wed Jan 15 12:56:01 EET 2020


---
 libavformat/wavdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index 3571733817..d8a27c79cf 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -77,7 +77,7 @@ static void set_spdif_s337m(AVFormatContext *s, WAVDemuxContext *wav)
                 ret = AVERROR(ENOMEM);
             } else {
                 int64_t pos = avio_tell(s->pb);
-                len = ret = avio_read(s->pb, buf, len);
+                len = ret = avio_read(s->pb, buf, FFMIN(len, wav->data_end - pos));
                 if (len >= 0) {
                     ret = ff_spdif_probe(buf, len, &codec);
                     if (ret > AVPROBE_SCORE_EXTENSION) {
-- 
2.14.1.windows.1



More information about the ffmpeg-devel mailing list