From patchwork Mon Dec 20 20:46:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 32773 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4743816iog; Mon, 20 Dec 2021 12:46:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJztkp7sTBOTnjw2tkOk5QbyqHwH/kuIpAdHb1QlWxKstpeFgI+lzfqK+ggzQhc8WXKY72s0 X-Received: by 2002:a17:906:e118:: with SMTP id gj24mr15049638ejb.138.1640033208498; Mon, 20 Dec 2021 12:46:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640033208; cv=none; d=google.com; s=arc-20160816; b=QJs2Js+RDxZt/GN0m5CPyRelcHcLVaoD6Uu1tLP/a8pMs9vBOITXu+XVfbgGxkd5UP 00pZlh5cXjtH/Z7hr6tiaCcgf9ciLF9eSucOgYvEu2awzvz3ObkyJr7yCErg3WWvm7yW wSigUBSZeimSdEA6mx5nVPtoIvlpe/lepntoDpTvPpLD2XeQz5gOU2Q/EJEj/BlzzOIo RlfHNhniYn+liz8ELWrjL1Q0LNeq5MZyflehrGiNt4Dt5FSqdI44bvT3rlhrOGsAYo6O yvFD92hDqVApWMoL4afDP9Zfh8VsmqN0tTSY0bQUsDbnGNX9hK5l4BgDIJmU6ZXyPe3X ct+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=ecNeYAMOd1167liP3M4RO8mjIH21gCIoP0wmNqOk2CA=; b=GWjz/J2RH8IgjgSF0khQtfcIUj5Dkfmw1KHIDA0p6ai6QVCtRno7Nk4bAbDogOcXvF 95YhC6goFSamNkr/a6o3IntsjP2YpADqwPV4D9ALIwfLjEFyadKx1DS+eivB/gsFa0pu cAJFijATSOJrgk+MgcaNzbVP3wvL0rM845pdzIbhmAozM0fDCzsRY8vWO7ZSwf9LxYII 9UEET1D3r1NFoP16a3vZa7bEIMI6CGucbrfXTpXLLu9kxdj15R6/TTpKsGNwciQsCJkX SgIRidiA7rYwx7GeYxXJAHWwcQHiS+LrIrUf/gkQI5jdmIkLw3Sv8QxPEHRnj5FyPS9w PdAA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l3si13255196ejo.955.2021.12.20.12.46.48; Mon, 20 Dec 2021 12:46:48 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C151968A82A; Mon, 20 Dec 2021 22:46:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6242B68008A for ; Mon, 20 Dec 2021 22:46:39 +0200 (EET) Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4JHs7y3mNVzQklk for ; Mon, 20 Dec 2021 21:46:38 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Dec 2021 02:16:09 +0530 Message-Id: <20211220204609.199-1-ffmpeg@gyani.pro> In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avformat/mov: abort reading truncated stts X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KwXVlvjBlTLp Avoids overreading the box and ingesting absurd values into stts_data --- libavformat/mov.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 2aed6e80ef..5a7209837f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2935,6 +2935,11 @@ static int mov_read_stts(MOVContext *c, AVIOContext *pb, MOVAtom atom) avio_rb24(pb); /* flags */ entries = avio_rb32(pb); + if (atom.size < 8 + (int64_t)entries*8) { + av_log(c->fc, AV_LOG_ERROR, "Truncated STTS box for st %d.\n", c->fc->nb_streams-1); + return AVERROR_INVALIDDATA; + } + av_log(c->fc, AV_LOG_TRACE, "track[%u].stts.entries = %u\n", c->fc->nb_streams-1, entries);