From patchwork Thu Nov 30 22:58:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 6478 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp451335jah; Thu, 30 Nov 2017 14:58:51 -0800 (PST) X-Google-Smtp-Source: AGs4zMbFXOGoO7MivtYFZUFHEkzj+tMeRcw2ibiyFuxH41leandoU3S+Re0j/7WMpoGL6gM/w+Sk X-Received: by 10.28.94.75 with SMTP id s72mr3128243wmb.112.1512082731232; Thu, 30 Nov 2017 14:58:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512082731; cv=none; d=google.com; s=arc-20160816; b=Hq5H7fb9BE68t8EvLQcKQyBtlQLwVZdyHp66Ht6rR8k0oHSRYWUmZKMfENhBb45mtF J5omOBUq1Q5FgXlwbqaCr2QmsY162DcxOTRYuWD/j8GkJF7yp4z09w0iG5Go9Sop7LEc 3O/HypMVK5fl34UPYzWgZqybqRhCNpJRnn0l+GEyCWKw8/7CLPJUAzSuqdwNEi68TtPb 4fAXU1aft2NyctX0WQSmayZ7CxRIlSxC/1EMU1HSTHTKYOBgk5ItLkcHf3mQg3NbPlVr rhfW0ZiAG5BV3x0RN7PbgljY7tEAlxYcq8Y17Puttt8QlUfx01o4LoS760QzVz2tHsKc LR4g== 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=/uRnbEjUxA059VVztOajq23oF8jZ+5XVHxMK9mzJup0=; b=QGYbiF/vcMPdFXsrOKJ1HBv++SKVNbA3RnYt/STNkoxlHReWMB/TrmZerTdlcXLrt8 lE/g0wNtJZ6dajniVw0PNszjKeko5F1LH56v9Mi+OCUbxmB7uCHgkYJ24n2cw/EFVebL VslRRMHsQtbmkAcoCxiL+q+RtufwPI7b0lls03GSguFFXZMOy1eWjLbHnqKgCtA5dLul 6UHkZVD5fxbdLx/HN94jFCwFUwUsmUtfXUVaPLPMs4omA1BdVQYcwR2oqHL+yMxIcbzA tjoyA8/MwTYnJvNnU6kv7RsAJHGqe5UbZeG1/ZZDORainnTRreal4VWU+9zwP4JN4oPc 5krA== 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 n25si3946664wrn.210.2017.11.30.14.58.50; Thu, 30 Nov 2017 14:58:51 -0800 (PST) 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 0ED7968A3ED; Fri, 1 Dec 2017 00:58:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe02-2.mx.upcmail.net (vie01a-qmta-pe02-2.mx.upcmail.net [62.179.121.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 52AC568A3D3 for ; Fri, 1 Dec 2017 00:58:23 +0200 (EET) Received: from [172.31.218.48] (helo=vie01a-dmta-pe06-3.mx.upcmail.net) by vie01a-pqmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1eKXmk-0001f3-Ku for ffmpeg-devel@ffmpeg.org; Thu, 30 Nov 2017 23:58:26 +0100 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1eKXmf-0004Wo-2O for ffmpeg-devel@ffmpeg.org; Thu, 30 Nov 2017 23:58:21 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id gNyD1w01b0S5wYM01NyEQk; Thu, 30 Nov 2017 23:58:15 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 30 Nov 2017 23:58:10 +0100 Message-Id: <20171130225811.13103-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171130225811.13103-1-michael@niedermayer.cc> References: <20171130225811.13103-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/j2kenc: Fix out of array access in encode_cblk() 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: 4427/clusterfuzz-testcase-minimized-5106919271301120 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/j2kenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index 32c7fddb74..78ec88a694 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -690,7 +690,8 @@ static void encode_cblk(Jpeg2000EncoderContext *s, Jpeg2000T1Context *t1, Jpeg20 cblk->npasses = passno; cblk->ninclpasses = passno; - cblk->passes[passno-1].rate = ff_mqc_flush_to(&t1->mqc, cblk->passes[passno-1].flushed, &cblk->passes[passno-1].flushed_len); + if (passno) + cblk->passes[passno-1].rate = ff_mqc_flush_to(&t1->mqc, cblk->passes[passno-1].flushed, &cblk->passes[passno-1].flushed_len); } /* tier-2 routines: */