From patchwork Mon Nov 2 00:21:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 23314 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 24B2F44BD54 for ; Mon, 2 Nov 2020 02:22:37 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0853168B38D; Mon, 2 Nov 2020 02:22:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 332D568AB33 for ; Mon, 2 Nov 2020 02:22:30 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1kZNcD-0009lf-0O for ffmpeg-devel@ffmpeg.org; Mon, 02 Nov 2020 01:22:29 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id ZNbFkpy5OIr7GZNbFkjsYZ; Mon, 02 Nov 2020 01:21:29 +0100 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=QN4WuTDL 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=gV_hb5M37nKYwIPPPH0A:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 2 Nov 2020 01:21:26 +0100 Message-Id: <20201102002128.6685-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201102002128.6685-1-michael@niedermayer.cc> References: <20201102002128.6685-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKUBH2IhpTdjO9+Nh482TrmQn9Z1L1lJrrkRkRByKu96lsxPOvBlZvVSz30pXCaV07EHbFw/pfA7q5ryd9+4Jj9g4zoEiHk5HYjKp0uckI7y+eAHQ9Ov CV7AeNzOJM5ZeJK5Ya222ZVlwQHUctd7VS7bdWi/1uQP5Y1rp+xB9KaP Subject: [FFmpeg-devel] [PATCH 3/5] avformat/wavdec: Check for EOF in cues reading 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: Timeout (>20sec -> 1ms) Fixes: 26793/clusterfuzz-testcase-minimized-ffmpeg_dem_WAV_fuzzer-5674966852567040 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/wavdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index a81f2c7a67..5b9869939f 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -558,6 +558,9 @@ static int wav_read_header(AVFormatContext *s) for (int i = 0; i < nb_cues; i++) { unsigned offset, id = avio_rl32(pb); + if (avio_feof(pb)) + return AVERROR_INVALIDDATA; + avio_skip(pb, 16); offset = avio_rl32(pb);