From patchwork Sat Jun 15 13:51:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 13542 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id DF6B244641D for ; Sat, 15 Jun 2019 16:59:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BD28968A148; Sat, 15 Jun 2019 16:59:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe08-2.mx.upcmail.net (vie01a-dmta-pe08-2.mx.upcmail.net [84.116.36.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB0AC689F2B for ; Sat, 15 Jun 2019 16:59:24 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe08.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1hc97b-0006k3-16 for ffmpeg-devel@ffmpeg.org; Sat, 15 Jun 2019 15:53:31 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id c96chyqqZ5D5Nc96chneF3; Sat, 15 Jun 2019 15:52:31 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.41.20 X-CNFS-Analysis: v=2.3 cv=bu8y+3Si c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=1XWaLZrsAAAA:8 a=ehW8UqtNlJpGlJm1aDwA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 15 Jun 2019 15:51:54 +0200 Message-Id: <20190615135154.14697-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfOmWDLZIq1dZHjwNL7DM7Oml7DWavYcoKxt6UDKNXDcBCTqPirKIuvBKQSS1v0rsf4mqaQJTPS/BxpBhYQyB5rm4pBVSU/VkahgiaHB5liI7Se65OVFO S7sfLp5LNPVrRkLRJJk+HoRTQcxY5ypEbts04ztuPMsQRbMw3YgoObFrfmckkjGVVR/Y0P00AsXAcI5inld8FwdPSljmtIfmp/Y= Subject: [FFmpeg-devel] [PATCH] avformat/mov: Set fragment.found_tfhd only after TFHD has been parsed X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Matt Wolenetz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: Assertion failure Fixes: crbug971646.mp4 Reported-by: Matt Wolenetz Reviewed-by: Matt Wolenetz 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 78f692872b..327a25bbdf 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4562,8 +4562,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); @@ -4579,6 +4577,7 @@ static int mov_read_tfhd(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_log(c->fc, AV_LOG_WARNING, "could not find corresponding trex (id %u)\n", track_id); return 0; } + c->fragment.found_tfhd = 1; frag->track_id = track_id; set_frag_stream(&c->frag_index, track_id);