From patchwork Tue Apr 17 00:13:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 8468 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.85 with SMTP id c82csp1375295jad; Mon, 16 Apr 2018 17:15:31 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/kFClJBNaZlq7DVx9vJTFOvduDe6Dft3Z8P3c1vdWnyiPVEHKxhsR2uVIyu7QKtNGs1aNO X-Received: by 10.28.207.68 with SMTP id f65mr204719wmg.1.1523924131173; Mon, 16 Apr 2018 17:15:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523924131; cv=none; d=google.com; s=arc-20160816; b=IBxg2Ff0m7jBC8UwlmXSV0YYYT+F0Plzlpf8rL+47giBomE0qJA/pCWGOA/08fvCdO fI9jL4g+TJ/AMx3aVy42kq7c7fBBgLVKCP0/WJIJnFRpPd9gtDgnksu5UarB3iTOv9sr cw0xi8rD9gfq+GK3TaqZC0yGGEuFXtLVdKBGXHLCbgmFAJApATo/RuFWNRivr15J50+W qubKA3tvmrGprXK4IcgH7ODwPRqQoDjmzGOEOp96jloMsmrX8AyL2XyYyVoDsfKjr1Xu bNWBgUZeypGZeoFXEqjlL/C+p/9cBvoUCNX9JulVR3Bp4LchJRc3ivVrv/Vqd1OH8w0i PcZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=bphWjoXFt1iyZkHAPFzkLDAkjNklLgt4Xl3ChC3q0U4=; b=ZxBDXiISS3GSA12vJxosuWbJLk+2Rm7AuGCghJgcKIArRd38dMoAtmJPkyD2znwqEX aKnFpCMXUx+fhwHkJYSilHGePU6r3lffNZ8JJHQTxp0s1CRPZOSnHLDLeEnclc7PeQ4d b6f8CudwXhUhcuAtDBqfND904OI7d+S9kyqlpmufvq5nnuSvfSdzOo2wFd7U8t1LACfs 0et5XwgS65UG6dXLYc9otpTgRv3RSt75HukVazc/ztyKz1IUaMAJM0qFrdJvDV438b2C XPetHyqdDzeUc/H5Q4EOLUJTRvAItocz57AOiO62cXrsrDS7z14hKGmFB0GNu/GcXBsq izLw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n2si562588wme.106.2018.04.16.17.15.30; Mon, 16 Apr 2018 17:15:31 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 99482689EFE; Tue, 17 Apr 2018 03:14:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe02-1.mx.upcmail.net (vie01a-qmta-pe02-1.mx.upcmail.net [62.179.121.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 40D77689D94 for ; Tue, 17 Apr 2018 03:14:27 +0300 (EEST) Received: from [172.31.218.31] (helo=vie01a-dmta-pe01-1.mx.upcmail.net) by vie01a-pqmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1f8EGr-0000S2-Ku for ffmpeg-devel@ffmpeg.org; Tue, 17 Apr 2018 02:14:53 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1f8EGq-0005bX-5S for ffmpeg-devel@ffmpeg.org; Tue, 17 Apr 2018 02:14:52 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id bCEi1x0030S5wYM01CEjMW; Tue, 17 Apr 2018 02:14:43 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 17 Apr 2018 02:13:43 +0200 Message-Id: <20180417001346.8174-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180417001346.8174-1-michael@niedermayer.cc> References: <20180417001346.8174-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/cinepak: Skip empty 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Speeds up decoding from 3 to 0.1 seconds for 6302/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CINEPAK_fuzzer-5626371985375232 Fixes: Timeout Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cinepak.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index ba0589582f..17e3afc35c 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -444,6 +444,7 @@ static int cinepak_decode_frame(AVCodecContext *avctx, const uint8_t *buf = avpkt->data; int ret = 0, buf_size = avpkt->size; CinepakContext *s = avctx->priv_data; + int num_strips; s->data = buf; s->size = buf_size; @@ -451,6 +452,12 @@ static int cinepak_decode_frame(AVCodecContext *avctx, if (s->size < 10) return AVERROR_INVALIDDATA; + num_strips = AV_RB16 (&s->data[8]); + + //Empty frame, do not waste time + if (!num_strips) + return buf_size; + if ((ret = cinepak_predecode_check(s)) < 0) { av_log(avctx, AV_LOG_ERROR, "cinepak_predecode_check failed\n"); return ret;