From patchwork Fri May 4 17:43:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 8784 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp283968jad; Fri, 4 May 2018 10:45:18 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrvtkdJU1hffW4qGn1WLoB+t2wWor8dK+L0ylWL/wtog+k0wT581OvMEjml2hcZqtwJnv1C X-Received: by 2002:adf:8822:: with SMTP id d31-v6mr21312257wrd.18.1525455918623; Fri, 04 May 2018 10:45:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525455918; cv=none; d=google.com; s=arc-20160816; b=xLi7PxNu+zsrB6AQwrXifYieK2xFn7ugjsEFtVokrM6hc3zFkUuLTdiuRUBneKNgMw 6YEgyZtK5mHKAvAxwoTaWMmy+Af+WbnTNd0Vu0hUfGMLvKmfn0JYz+Tygc1LkOIcrCLy lf48FXNO9b1maF+SoL/J6Undb422AQoHnYHGH/L8HwtOVhRqYpnQDFudsgjPAuyAeeC0 PRSGV/ld/MZUdGk9JozjcnRQgeW2fdO3YI3Od5dgUoquPXONvuI3Mb1+ZdKqvV2aX6q/ 5sh4iPg/h+qMLmi5C6QmrHB7HMNcyzHCpXbjST/kmJDuuppOtauIxteAEfBMeeBb75s6 XCKQ== 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=8mT5bSFqhFUwAoOA5RetbcP9IXx2k2BavqTptG1Oq58=; b=tUnEXzeGT6C+HegenryV2uGkZa9FP14aK8Zmd9oTvFdTSJt/3F/mG3pS7yn00jpsZn Rebh7UEPNVncygy3ZxNtNlShJeIJTtemzTKJDO6CbrzLdwQ6iK5rozAV+dRyT7SIbVhu uiLkzjjFItEeKAaO+sz/f8rtbQTF2KJq9fmX83FPrsSn2mKJWVdtnLZMgI1tarNBZNfh +KGamkPkXB4c5+jBDqA9XNLPJ6MciOeRkQ7Yr1hyg7+Yy207eT3fKrTkKV4Tc1VELrY7 tmEWpJkzV76OMsDqHMCnNwcNvsb1DWUjMRhXn19OrNeVoqQZFpAfgRmgm5O2bmN4u29a WKgA== 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 h8-v6si1650438wmh.218.2018.05.04.10.45.17; Fri, 04 May 2018 10:45:18 -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 A0B3A68A561; Fri, 4 May 2018 20:44:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-1.mx.upcmail.net (vie01a-dmta-pe02-1.mx.upcmail.net [62.179.121.157]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4EDA068A4CB for ; Fri, 4 May 2018 20:44:35 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fEelY-0006mq-Ol for ffmpeg-devel@ffmpeg.org; Fri, 04 May 2018 19:45:08 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id iHl61x01q0S5wYM01Hl7qG; Fri, 04 May 2018 19:45:07 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 4 May 2018 19:43:47 +0200 Message-Id: <20180504174348.24364-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180504174348.24364-1-michael@niedermayer.cc> References: <20180504174348.24364-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/jpeg2000dec: Skip init for component in CPRL if nothing is to be done 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: assertion failure Fixes: 7949/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-4819602782552064 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/jpeg2000dec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 6aa63a9771..5aa0713ed6 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1159,6 +1159,9 @@ static int jpeg2000_decode_packets_po_iteration(Jpeg2000DecoderContext *s, Jpeg2 step_x = 32; step_y = 32; + if (RSpoc > FFMIN(codsty->nreslevels, REpoc)) + continue; + for (reslevelno = RSpoc; reslevelno < FFMIN(codsty->nreslevels, REpoc); reslevelno++) { uint8_t reducedresno = codsty->nreslevels - 1 -reslevelno; // ==> N_L - r Jpeg2000ResLevel *rlevel = comp->reslevel + reslevelno;