From patchwork Tue May 4 21:05:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27587 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp748143iob; Tue, 4 May 2021 14:11:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4plKFqpNB5jOYW+eqmQ2O1yZCTJ66tURiGu8sB+Dnf7sna//bpKRosYDO/uMkw2N1/ghE X-Received: by 2002:a05:6402:341:: with SMTP id r1mr27888699edw.113.1620162710223; Tue, 04 May 2021 14:11:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620162710; cv=none; d=google.com; s=arc-20160816; b=Kpmko7iI1/l5qTYr2YqScMB8EjWLDBizZcdKoZNkAK0o2y6vqAlbXaTSMMpmpvelip C2dB381FgfH0IABDreVrQ22nfz6C9orMR8nlNo8WfhfJDL3v7QfO68BFoEHBdwfGWqj6 k6oiEQGlBl7YWGKUMm3+YTWZ55rerVZxxVeuwuCNBHU0a9UamFLkn95/pdIcKzvAX1kG Kz+gLkilBsvyWoMZcZFeVExOSG7RKRvwD9rtsRAqQTQ4czb7wxkS6tRHqg5gpSP2sg/U GcURT0aPXGvdLaakcsNsUuYYY0zdbQGl1YpGNzLW8UzPfoXoBMZbrLJVezgybTfc3qnI ElRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=IcKMglcQ6n9LURLa1pdywCf9FTU5NSLyvMFITVge2TA=; b=JswXsBW0p47DIR/ZX1uu4dUXdVovWlaPCptkuyhZNp4hWyHmXDEfvMaIKc7193g4QP 8fAbABGOrMCv9H4ZKx0diwy08aFeV+VwkW6dUaASXTtouUK1K2c458LEq9c0M4a4Tn13 /N9V5a2v8p9UhhaPM7mQSSRdEkweylfMegw9nLALOC71fc5xLrhmFg1rn7TYGbEvZVqv sDH5bvcbzRnx8zal+B8AUvNIE+IE9pXcSpIOemYUGdOxCHW7KCE5KhNW3ndg7tBWb0Cl MTcODx2U5FHY6CG8+/lCigSq6GRir+aOwme7dBGQHqUxu1aCbtI8Idmb1kFFzqdWPqLA GA9w== 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 n23si3658456eje.216.2021.05.04.14.11.45; Tue, 04 May 2021 14:11:50 -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 CDE34680C0A; Wed, 5 May 2021 00:11:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-1.mx.upcmail.net (vie01a-dmta-pe01-1.mx.upcmail.net [62.179.121.154]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 536366804D6 for ; Wed, 5 May 2021 00:11:34 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1le2F2-001Zb3-07 for ffmpeg-devel@ffmpeg.org; Tue, 04 May 2021 23:06:04 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id e2E4lfjFAljeHe2E4lW7Xk; Tue, 04 May 2021 23:05:04 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=6AsULcmmzbk9M7o_s9EA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 4 May 2021 23:05:03 +0200 Message-Id: <20210504210504.13396-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210504210504.13396-1-michael@niedermayer.cc> References: <20210504210504.13396-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfLWmxNpjl5hO2xseVxI9JtvoG3LbjHFqFqZYJUV+yo889p82iO/lm4YyDCwtebAT8k35Qz11w1ONjScc98QE7aUMj1WBXev6hpMahbE3w6/tKQuqwRis 7f73ZwBIN72qFCb0Iynop9zt/ABZzm8j0FhXmS9Zp8ALN6p5aYI2N4gH Subject: [FFmpeg-devel] [PATCH 2/3] avformat/tta: Check for EOF in index reading loop 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QA5XcdtAogNd Fixes: OOM Fixes: 33585/clusterfuzz-testcase-minimized-ffmpeg_dem_TTA_fuzzer-4564665830080512 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/tta.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/tta.c b/libavformat/tta.c index 7a95675794..e1f9cf27d8 100644 --- a/libavformat/tta.c +++ b/libavformat/tta.c @@ -119,6 +119,8 @@ static int tta_read_header(AVFormatContext *s) for (i = 0; i < c->totalframes; i++) { uint32_t size = avio_rl32(s->pb); int r; + if (avio_feof(s->pb)) + return AVERROR_INVALIDDATA; if ((r = av_add_index_entry(st, framepos, i * (int64_t)c->frame_size, size, 0, AVINDEX_KEYFRAME)) < 0) return r;