From patchwork Mon Jun 27 20:02:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 36491 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp2226159pzh; Mon, 27 Jun 2022 13:03:48 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sADE4Rrs2C7VOKOmnp3ZCDt5yDyNSQJT2ZosWYrFh6CvNQYZX8fqn6iMjEJmVnBzzIpRLe X-Received: by 2002:a05:6402:5249:b0:435:a419:300a with SMTP id t9-20020a056402524900b00435a419300amr18762926edd.56.1656360228189; Mon, 27 Jun 2022 13:03:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656360228; cv=none; d=google.com; s=arc-20160816; b=kScrS2jPcwujek8tXrwDeTkw2huOTwUgn10SpksHFmH5h62okAQrd4MLXLaSam5LCU tD7PERJ7getbfmg5lqNQ6N6vYumDSE8rupK3MrXH30jPWJ8wcKp/CzuD8vRqm5Apjg9G oiuz8aXIqIC2B7oKHI1CBEWyoZVsJ/Bku0ux0oSp2aXooOPZO0nREGF5vWIZTfRnJQCc 69T/3Uo/fKVGrSwTGF2RlOSU+qcLWIWi9pBzXuYrfvRuHok/PCvC1eIs0l/2yyl3v+7D YSQXSbG0G8q8GjfdBwlJEukmhShiJD08baDLL+/ubPqi1K/InF1Opn3q7/Usv5yeDtVK LtEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=Njk7ncWt6uT5OP+Q9v5LNrMk36bSzhkSK3H1/Sp5uiA=; b=buPGAGg0f9f+SRYzgZKos1LZ2PdVKS107/XKGx4r7WZcIMYX6eZBG0ie5zkOMo/UAl 1Dnm0yIdgc5xtzxSV/tT8HXUDAy+w7pzKZo52rTRF0OgHSrjwNz/6PJOBi52fGoE2fZz b6ACuAfmj97GoFH1Pj55wMrQki6UoWJLS95iVmR5lDVpcg1hBhSjUw1DWv3bM7bEnm0c 2SRCxX74Uisqwt3SJqeRLzCcF84eZyYOo0sIkANwvP+ADHPStwnxACzWuNm50ggLwDSs zKq/pNuXfD6T+k6ELAUoEb4wtyGJkRTfKF2e12I1vuNJqMGTkth1jbcQuDHkfyXzQfYb JRyw== 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 g11-20020a17090669cb00b0071728eab6a8si552730ejs.124.2022.06.27.13.03.47; Mon, 27 Jun 2022 13:03:48 -0700 (PDT) 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 3A4EC68B8F6; Mon, 27 Jun 2022 23:03:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C1C4968B8F0 for ; Mon, 27 Jun 2022 23:03:42 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 85E4FE74EF; Mon, 27 Jun 2022 22:03:42 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QkYx9yx1Yt4w; Mon, 27 Jun 2022 22:03:14 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 7E9AFE7455; Mon, 27 Jun 2022 22:02:51 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Jun 2022 22:02:41 +0200 Message-Id: <20220627200241.7102-3-cus@passwd.hu> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220627200241.7102-1-cus@passwd.hu> References: <20220627200241.7102-1-cus@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/mov: disallow a zero sample size in trun atoms 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 Cc: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: IGvI7VYwGbJ1 In order to not generate 0 sized packets or create a huge index table needlessly. Fixes: Timeout Fixes: 43717/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-5206008287330304 Fixes: 45738/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-6142535657979904 Signed-off-by: Marton Balint --- libavformat/mov.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index c6fbe511c0..d7ef6ba6d6 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5179,6 +5179,8 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) distance++; if (av_sat_add64(dts, sample_duration) != dts + (uint64_t)sample_duration) return AVERROR_INVALIDDATA; + if (!sample_size) + return AVERROR_INVALIDDATA; dts += sample_duration; offset += sample_size; sc->data_size += sample_size;