From patchwork Fri Mar 8 16:38:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 12264 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 8B3C6448FB6 for ; Fri, 8 Mar 2019 18:40:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 72D4E68A6E7; Fri, 8 Mar 2019 18:40:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-3.mx.upcmail.net (vie01a-qmta-pe01-3.mx.upcmail.net [62.179.121.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB4D568A50A for ; Fri, 8 Mar 2019 18:40:29 +0200 (EET) Received: from [172.31.218.45] (helo=vie01a-dmta-pe05-3.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1h2IXs-0001K7-W1 for ffmpeg-devel@ffmpeg.org; Fri, 08 Mar 2019 17:40:29 +0100 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.88) (envelope-from ) id 1h2IXm-0005u1-0p for ffmpeg-devel@ffmpeg.org; Fri, 08 Mar 2019 17:40:22 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 2IWohUZN1xLwq2IWohOZil; Fri, 08 Mar 2019 17:39:22 +0100 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=WaxylHpX c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=o9RHTMn9ULtBfhmOinUA:9 a=3BvQatI2s_Cx7k7V:21 a=tt-DKHv_vg-X_3GJ:21 a=1fhp2MxaeJtTNGEnv6mo:22 a=pHzHmUro8NiASowvMSCR:22 a=nt3jZW36AmriUCFCBwmW:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 8 Mar 2019 17:38:34 +0100 Message-Id: <20190308163834.31692-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190308163834.31692-1-michael@niedermayer.cc> References: <20190308163834.31692-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfEjKG3hNqKsHcSxoxIta7Bq4Whf+2uBR54aQCwCII0+4EZq89l34zp42cejOvLTX0H25OcKrr8dZd72VfHUDpEszFNrPrVWPI3yzwgz1Ty0tYXdCj3Sy qo1Btrb/bOYN/coA6IgNMM8yzL1aNLi4pcQ13MG/VyD3E4QBFWffoGUE Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/diracdec: Count truncated parts as errors in decode_component() 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" Fixes: Timeout (29sec -> 4sec) Fixes: 13150/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-5690185671507968 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/diracdec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index 30b4bfad79..a1e759f656 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -685,7 +685,10 @@ static int decode_component(DiracContext *s, int comp) } align_get_bits(&s->gb); b->coeff_data = s->gb.buffer + get_bits_count(&s->gb)/8; - b->length = FFMIN(b->length, FFMAX(get_bits_left(&s->gb)/8, 0)); + if (b->length > FFMAX(get_bits_left(&s->gb)/8, 0)) { + b->length = FFMAX(get_bits_left(&s->gb)/8, 0); + damaged_count ++; + } skip_bits_long(&s->gb, b->length*8); } }