From patchwork Sat Nov 9 22:39:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 16179 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 73BB9448C0D for ; Sun, 10 Nov 2019 00:41:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 65A6268AFA3; Sun, 10 Nov 2019 00:41:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-1.mx.upcmail.net (vie01a-dmta-pe06-1.mx.upcmail.net [84.116.36.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 68F6568ABEE for ; Sun, 10 Nov 2019 00:41:32 +0200 (EET) 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 1iTZQC-0008X6-0G for ffmpeg-devel@ffmpeg.org; Sat, 09 Nov 2019 23:41:32 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id TZPDiM4OQwlysTZPDiRHlh; Sat, 09 Nov 2019 23:40:31 +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=E5OzWpVl c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=WNILtR_XHyyWU98dWJsA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 9 Nov 2019 23:39:04 +0100 Message-Id: <20191109223907.11014-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191109223907.11014-1-michael@niedermayer.cc> References: <20191109223907.11014-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfO01pA9dM1mTbY2N8Rwt5Rb9LHKWIEs6XyjncWmU6NFhea2YDtL/SBJoZMX8hqXezCBqO9SgYu/oPL6g26qiFbWpCEGbX6Ed7ncDOIC4GolW6VmeRAtP bL17iyz5vsPujcEpAl712e67/tUdsLL2xOtT1SvBikKA3VexN6tYUs5+ Subject: [FFmpeg-devel] [PATCH 4/7] avcodec/g729dec: Avoid using buf_size 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" buf_size is not updated as buf is advanced so it is wrong after the first iteration Fixes: Timeout (160sec -> 27sec) Fixes: 18658/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G729_fuzzer-5729784269373440 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/g729dec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c index 300fac1c04..4d70cb6eba 100644 --- a/libavcodec/g729dec.c +++ b/libavcodec/g729dec.c @@ -454,11 +454,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, buf++; } - for (i = 0; i < buf_size; i++) + for (i = 0; i < format->block_size; i++) frame_erasure |= buf[i]; frame_erasure = !frame_erasure; - init_get_bits(&gb, buf, 8*buf_size); + init_get_bits(&gb, buf, 8*format->block_size); ma_predictor = get_bits(&gb, 1); quantizer_1st = get_bits(&gb, VQ_1ST_BITS);