[FFmpeg-cvslog] avformat/argo_asf: bail if invalid tag

Zane van Iperen git at videolan.org
Mon Sep 14 07:42:35 EEST 2020


ffmpeg | branch: master | Zane van Iperen <zane at zanevaniperen.com> | Sun Sep  6 11:00:17 2020 +1000| [0476b6ee1eaa258c7b527de0f477f6b4c9838dab] | committer: Zane van Iperen

avformat/argo_asf: bail if invalid tag

Signed-off-by: Zane van Iperen <zane at zanevaniperen.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0476b6ee1eaa258c7b527de0f477f6b4c9838dab
---

 libavformat/argo_asf.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index bf9b5d0c0a..208280b4d9 100644
--- a/libavformat/argo_asf.c
+++ b/libavformat/argo_asf.c
@@ -144,6 +144,9 @@ static int argo_asf_read_header(AVFormatContext *s)
 
     argo_asf_parse_file_header(&asf->fhdr, buf);
 
+    if (asf->fhdr.magic != ASF_TAG)
+        return AVERROR_INVALIDDATA;
+
     if (asf->fhdr.num_chunks == 0) {
         return AVERROR_INVALIDDATA;
     } else if (asf->fhdr.num_chunks > 1) {



More information about the ffmpeg-cvslog mailing list