[FFmpeg-cvslog] avformat/mov: check result of avio_seek

Zhang Rui git at videolan.org
Thu May 21 19:09:37 CEST 2015


ffmpeg | branch: master | Zhang Rui <bbcallen at gmail.com> | Thu May 21 11:48:55 2015 +0800| [c886dd2f5875e01a5949fddd0388c965c7766cfb] | committer: Michael Niedermayer

avformat/mov: check result of avio_seek

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/mov.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index ed2afd4..f6f07be 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -4240,7 +4240,10 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
         mov->found_mdat = 0;
         if (!mov->next_root_atom)
             return AVERROR_EOF;
-        avio_seek(s->pb, mov->next_root_atom, SEEK_SET);
+        if (avio_seek(s->pb, mov->next_root_atom, SEEK_SET) != mov->next_root_atom) {
+            av_log(mov->fc, AV_LOG_ERROR, "next root atom offset 0x%"PRIx64": partial file\n", mov->next_root_atom);
+            return AVERROR_INVALIDDATA;
+        }
         mov->next_root_atom = 0;
         if (mov_read_default(mov, s->pb, (MOVAtom){ AV_RL32("root"), INT64_MAX }) < 0 ||
             avio_feof(s->pb))



More information about the ffmpeg-cvslog mailing list