From patchwork Mon Nov 9 23:04:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 23456 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 7196F44A87C for ; Tue, 10 Nov 2020 01:15:08 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 53B1468BCC5; Tue, 10 Nov 2020 01:15:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 24F3568B6F6 for ; Tue, 10 Nov 2020 01:15:02 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1kcGEY-000853-0O for ffmpeg-devel@ffmpeg.org; Tue, 10 Nov 2020 00:05:58 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id cGDZk5Cv5Ir7GcGDakz6yW; Tue, 10 Nov 2020 00:04:58 +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=zTMJI4JgmpooUKxKvc8A:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 10 Nov 2020 00:04:56 +0100 Message-Id: <20201109230456.11188-7-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201109230456.11188-1-michael@niedermayer.cc> References: <20201109230456.11188-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfBCETmCWpMVZWONVQicI1b5I2DczHG3TQvMhVIq0zIalywzqdCMzmLsnHkd/ktQLLK9y/pj9AtLt8IK58ratRgLqgLsOMsCIIKUz7D67kTpKt1SWZFPl G5PJqGy/91Qe5zHliYJHY7fsFei45XesKBcTZOxkHKMWX2Oy3qjFUnxs Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/cri: check for available input in unpack_10bit() 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 -> 56ms) Fixes: 26995/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CRI_fuzzer-5107217080254464 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cri.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavcodec/cri.c b/libavcodec/cri.c index dafbc1f1be..9bcd2ebfc6 100644 --- a/libavcodec/cri.c +++ b/libavcodec/cri.c @@ -80,10 +80,13 @@ static void unpack_10bit(GetByteContext *gb, uint16_t *dst, int shift, int pos = 0; while (count > 0) { - uint32_t a0 = bytestream2_get_le32(gb); - uint32_t a1 = bytestream2_get_le32(gb); - uint32_t a2 = bytestream2_get_le32(gb); - uint32_t a3 = bytestream2_get_le32(gb); + uint32_t a0, a1,a2,a3; + if (bytestream2_get_bytes_left(gb) < 4) + break; + a0 = bytestream2_get_le32(gb); + a1 = bytestream2_get_le32(gb); + a2 = bytestream2_get_le32(gb); + a3 = bytestream2_get_le32(gb); dst[pos] = (((a0 >> 1) & 0xE00) | (a0 & 0x1FF)) << shift; pos++; if (pos >= w) {