From patchwork Sun Apr 14 11:05:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 12733 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 46271447EBA for ; Sun, 14 Apr 2019 14:12:59 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 30F6468A8A3; Sun, 14 Apr 2019 14:12:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe08-2.mx.upcmail.net (vie01a-dmta-pe08-2.mx.upcmail.net [84.116.36.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5306168A7DA for ; Sun, 14 Apr 2019 14:12:52 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe08.mx.upcmail.net with esmtp (Exim 4.91) (envelope-from ) id 1hFcz3-0003c7-2q for ffmpeg-devel@ffmpeg.org; Sun, 14 Apr 2019 13:07:37 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Fcy4h5qD45D5NFcy5hATRw; Sun, 14 Apr 2019 13:06:37 +0200 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=bu8y+3Si 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=IaF93-62bSREls1SmxUA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 14 Apr 2019 13:05:03 +0200 Message-Id: <20190414110504.19222-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfOKKfSg/vN1JARV3KIsoXegC3z/HaibvQcsDDCM9Sun/R/znDxqmKAUazAObtHG6LSv9z6KRsTBG0XuZTm0UkwV+aTWOCta1ohvIpKZN4OQP49b5pSFf NZzTrz5/03zyGhNyhNKnf1yQ7EMvhFN0I0jdc7/w3zStxmkfhDa2+eU9 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/arbc: Skip unchanged frames 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 (16sec -> 5sec) Fixes: 14128/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ARBC_fuzzer-5767365721063424 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 a8b0bb0d8b..08d3a0ae6b 100644 --- a/libavcodec/arbc.c +++ b/libavcodec/arbc.c @@ -121,7 +121,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, bytestream2_skip(&s->gb, 8); nb_segments = bytestream2_get_le16(&s->gb); if (nb_segments == 0) - keyframe = 0; + return avpkt->size; if (7 * nb_segments > bytestream2_get_bytes_left(&s->gb)) return AVERROR_INVALIDDATA;