From patchwork Sat Aug 10 21:09:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 14386 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 7836A44A476 for ; Sun, 11 Aug 2019 00:17:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 628A868AA46; Sun, 11 Aug 2019 00:17:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-3.mx.upcmail.net (vie01a-dmta-pe06-3.mx.upcmail.net [84.116.36.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 04E4C68AB8A for ; Sun, 11 Aug 2019 00:17:22 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1hwYeF-0008u1-3a for ffmpeg-devel@ffmpeg.org; Sat, 10 Aug 2019 23:11:35 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id wYdGh60SRwlyswYdGhrKfh; Sat, 10 Aug 2019 23:10:34 +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=E5OzWpVl c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=BGXzBu8p6N_1AAT6Bh0A:9 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 10 Aug 2019 23:09:47 +0200 Message-Id: <20190810210949.1743-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190810210949.1743-1-michael@niedermayer.cc> References: <20190810210949.1743-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfHVY4FusxgfbREmieGnBbJRa7ktlo4q4KZiohAiLyyDKjM961vRJCtL7omXvoNMFa6SAe1sVKcEZsgiEQH93bWR1segEN4tx1lRKKZ2o7S7BO3jEu9fg hZ3bH1xdJDhBNg13NlP2zUshLkIVgl7fiYNCdRgLxXSGHxyPjrWcRJlT Subject: [FFmpeg-devel] [PATCH 6/8] avformat/vividas: Fix another infinite loop 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Not found by the fuzzer Signed-off-by: Michael Niedermayer --- libavformat/vividas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/vividas.c b/libavformat/vividas.c index a5f33181de..0c33ca2da8 100644 --- a/libavformat/vividas.c +++ b/libavformat/vividas.c @@ -546,7 +546,7 @@ static int viv_read_header(AVFormatContext *s) break; block_len = ffio_read_varlen(pb); - if (avio_feof(pb)) + if (avio_feof(pb) || block_len <= 0) return AVERROR_INVALIDDATA; block_type = avio_r8(pb);