From patchwork Mon Feb 1 22:31:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 25325 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 E491244B100 for ; Tue, 2 Feb 2021 00:32:30 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D02CA68A30C; Tue, 2 Feb 2021 00:32:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-2.mx.upcmail.net (vie01a-dmta-pe05-2.mx.upcmail.net [84.116.36.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 54367689DF4 for ; Tue, 2 Feb 2021 00:32:18 +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 1l6hk2-0007Tt-0E for ffmpeg-devel@ffmpeg.org; Mon, 01 Feb 2021 23:32:18 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 6hj3lYVlaljeH6hj3l7zaW; Mon, 01 Feb 2021 23:31:18 +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=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=jyEijOGMfr0EjQQSMFsA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 1 Feb 2021 23:31:13 +0100 Message-Id: <20210201223116.11378-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210201223116.11378-1-michael@niedermayer.cc> References: <20210201223116.11378-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfFHZp7zJQIR0oZ0lZeycN+bAuNW+3IzfxjsBeYedqCeaxOfhPfnnCzI39TSLnQm7RHIZoTz15EcQXa/o+QrALQDG65GSVt9XlSAWmCxP+N1JflJ/2Au/ sqGALo77oHqDLQG6x9l0EQl8XEYVMBnTO2un453PhFI4fvUpJgazYUCg Subject: [FFmpeg-devel] [PATCH 5/8] avcodec/cri: Stop the bitreader at the end of uncompressed input 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 Fixes: 29983/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CRI_fuzzer-6420415838814208 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cri.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/cri.c b/libavcodec/cri.c index f7c3b4ef48..2d33b54e42 100644 --- a/libavcodec/cri.c +++ b/libavcodec/cri.c @@ -331,6 +331,9 @@ skip: for (int y = 0; y < avctx->height; y++) { uint16_t *dst = (uint16_t *)(p->data[0] + y * p->linesize[0]); + if (get_bits_left(&gbit) < avctx->width * bps) + break; + for (int x = 0; x < avctx->width; x++) dst[x] = get_bits(&gbit, bps) << shift; }