From patchwork Sat Sep 12 18:18:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 22308 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 8104D44B31C for ; Sat, 12 Sep 2020 21:26:53 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 61B8868BB80; Sat, 12 Sep 2020 21:26:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-3.mx.upcmail.net (vie01a-dmta-pe06-3.mx.upcmail.net [84.116.36.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0443A68BACF for ; Sat, 12 Sep 2020 21:26:47 +0300 (EEST) 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 1kHA7w-0004Da-12 for ffmpeg-devel@ffmpeg.org; Sat, 12 Sep 2020 20:19:56 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id HA6xkrsa7Ir7GHA6xktp4v; Sat, 12 Sep 2020 20:18:56 +0200 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=_J7dEndpEQnI9Fm7_yUA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=bWyr8ysk75zN3GCy5bjg:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 12 Sep 2020 20:18:54 +0200 Message-Id: <20200912181855.29304-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfG1tljQolHlj6J3MISdFEtpcHNCXwR1mU73Pl2gRm7PyHmc0z9J/3/uw0ePyhL/AzhNVD/2gckDXn+TjQZoFArHXPvP3DBCB/soeVOX8l5Cgo5LEPglZ viYVZFSf6itrIcXEDyfMX3GxNUDstEhEz7bWKY1iUM/1itwC27hhvNW1 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/arbc: Assume that at least one segment has a tile 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" If no segment has a tile, the segment count really should be 0 Fixes: Timeout (61sec -> 2sec) Fixes: 25445/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ARBC_fuzzer-5657711222718464 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/arbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/arbc.c b/libavcodec/arbc.c index 06970f140b..9d8284df2b 100644 --- a/libavcodec/arbc.c +++ b/libavcodec/arbc.c @@ -133,7 +133,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, if (nb_segments == 0) return avpkt->size; - if (7 * nb_segments > bytestream2_get_bytes_left(&s->gb)) + if (7 * nb_segments + 6 > bytestream2_get_bytes_left(&s->gb)) return AVERROR_INVALIDDATA; if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0)