From cd9e249726de0d852986bbfa8ef35f854d63330e Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 15 Jun 2019 00:12:36 +0200 Subject: [PATCH] avformat/mov: Set fragment.found_tfhd only after TFHD has been parsed Fixes: Assertion failure Fixes: crbug971646.mp4 Reported-by: Matt Wolenetz Reviewed-by: Matt Wolenetz Signed-off-by: Michael Niedermayer (cherry picked from commit 696312c487d9d8c49a087017a829d1cdcbd68651) Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 1c85b51029..72fde25539 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4544,8 +4544,6 @@ static int mov_read_tfhd(MOVContext *c, AVIOContext *pb, MOVAtom atom) MOVTrackExt *trex = NULL; int flags, track_id, i; - c->fragment.found_tfhd = 1; - avio_r8(pb); /* version */ flags = avio_rb24(pb); @@ -4563,6 +4561,7 @@ static int mov_read_tfhd(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_log(c->fc, AV_LOG_ERROR, "could not find corresponding trex\n"); return AVERROR_INVALIDDATA; } + c->fragment.found_tfhd = 1; frag->base_data_offset = flags & MOV_TFHD_BASE_DATA_OFFSET ? avio_rb64(pb) : flags & MOV_TFHD_DEFAULT_BASE_IS_MOOF ?